Merge pull request #7546 from eileenmcnaughton/CRM-16259
authorDave Greenberg <dave@civicrm.org>
Wed, 6 Jan 2016 17:42:15 +0000 (09:42 -0800)
committerDave Greenberg <dave@civicrm.org>
Wed, 6 Jan 2016 17:42:15 +0000 (09:42 -0800)
Crm 16259


Trivial merge