096dcf1960f2ec70f2b4a7aff293cb41c4035081 - rave

commit: 096dcf1960f2ec70f2b4a7aff293cb41c4035081
[log]
author: Stanton Sievers <ssievers@w2odigital.com>
Tue Aug 12 17:26:43 2014 -0400
committer: Stanton Sievers <ssievers@w2odigital.com>
Tue Aug 12 17:26:43 2014 -0400
tree: d56a8f18aafd01be7aa254678933042f3d01a10b
parent: a79d859bd559f956fa638d8045d9af85ed6285e3 [diff]
parent: acf2cf696f79e87281119d9393c86d75ab02ba83 [diff]

Merge branch 'master' into RAVE-1273

Conflicts:
	rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java

tree: d56a8f18aafd01be7aa254678933042f3d01a10b