Merge pull request #3877 from eileenmcnaughton/CRM-15148
authorDave Greenberg <dave@civicrm.org>
Wed, 20 Aug 2014 23:46:30 +0000 (16:46 -0700)
committerDave Greenberg <dave@civicrm.org>
Wed, 20 Aug 2014 23:46:30 +0000 (16:46 -0700)
Crm 15148


Trivial merge