brianchandotcom/liferay-portal — pull request #17958 by shuyangzhou (2014-04-15 00:12:16+00:00)
Title: Lps 45956

Changed to , Type and Attribute.

Let me know if these names are ok.