Merge pull request #4640 from christianwach/crm-15672
authorcolemanw <coleman@civicrm.org>
Tue, 2 Dec 2014 21:53:26 +0000 (16:53 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 2 Dec 2014 21:53:26 +0000 (16:53 -0500)
CRM-15672


Trivial merge