brianchandotcom/liferay-portal — pull request #2921 by zberentey (2011-12-06 20:22:47+00:00)
Title: LPS-23769

LPS-23769 Site template merge fixes