topolik/liferay-portal — pull request #55 by jhinkey (2013-08-27 17:21:41+00:00)
Title: LPS-39202 editted properties

Hi Tom,

I found that the source files conflict on rebase with upstream master. Can you rebase and resolve them?

Thanks,
Jim