Merge pull request #4926 from colemanw/INFRA-132
authorcolemanw <coleman@civicrm.org>
Tue, 13 Jan 2015 21:24:14 +0000 (16:24 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 13 Jan 2015 21:24:14 +0000 (16:24 -0500)
INFRA-132 - Batch #1


Trivial merge