mikemanyoung/liferay-plugins — pull request #148 by dejuknow (2014-03-27 20:55:04+00:00)
Title: SYNC-1231

fixed merge issues