brianchandotcom/liferay-plugins — pull request #2105 by dejuknow (2013-09-24 17:34:53+00:00)
Title: LPS-39625

Fixed merge conflicts