mikemanyoung/liferay-portal — pull request #53 by evliu (2013-10-25 23:59:36+00:00)
Title: Lps 37352

rebased and resolved merge conflicts; tested rebased commits