Merge pull request #5142 from eileenmcnaughton/master
authorDave Greenberg <dave@civicrm.org>
Wed, 11 Feb 2015 22:28:57 +0000 (14:28 -0800)
committerDave Greenberg <dave@civicrm.org>
Wed, 11 Feb 2015 22:28:57 +0000 (14:28 -0800)
Preliminary phpcs cleanup


Trivial merge