Merge pull request #4979 from xurizaemon/codingstandards-12
authorTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 01:45:34 +0000 (17:45 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 01:45:34 +0000 (17:45 -0800)
Coding standards cleanup sprint.


Trivial merge