brianchandotcom/liferay-plugins — pull request #2216 by aarondelani (2013-10-18 23:33:39+00:00)
Title: SOS-1834-re

fixed merge conflict.

Thanks