natecavanaugh/liferay-portal — pull request #2658 by mjbradford89 (2014-07-15 23:18:46+00:00)
Title: LPS-48520 - Remove 'switchEditor' method from Liferay.Util

Hi Nate,

Sorry about that. I thought I merged all of the conflicts but that one must have slipped by me. Here it is without the source formatting commits.

Please let me know if there are any other issues.

Thanks!