Merge pull request #4931 from davecivicrm/INFRA-132
authorTim Otten <totten@civicrm.org>
Wed, 14 Jan 2015 03:21:30 +0000 (19:21 -0800)
committerTim Otten <totten@civicrm.org>
Wed, 14 Jan 2015 03:21:30 +0000 (19:21 -0800)
INFRA-132 - Batch #6


Trivial merge