Merge pull request #4883 from totten/master-cs4
authorTim Otten <totten@civicrm.org>
Fri, 9 Jan 2015 06:08:07 +0000 (22:08 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 9 Jan 2015 06:08:07 +0000 (22:08 -0800)
INFRA-132 - Misc cleanup


Trivial merge