Merge pull request #4973 from PalanteJon/cleanup-master
authorTim Otten <totten@civicrm.org>
Mon, 19 Jan 2015 06:53:05 +0000 (22:53 -0800)
committerTim Otten <totten@civicrm.org>
Mon, 19 Jan 2015 06:53:05 +0000 (22:53 -0800)
INFRA-132 batch 2 cleanup


Trivial merge