Merge pull request #5523 from eileenmcnaughton/4.6
authorcolemanw <coleman@civicrm.org>
Tue, 31 Mar 2015 13:20:32 +0000 (09:20 -0400)
committercolemanw <coleman@civicrm.org>
Tue, 31 Mar 2015 13:20:32 +0000 (09:20 -0400)
minor phpcs fixes


Trivial merge