Merge pull request #7266 from jmcclelland/CRM-17586-master
authorcolemanw <coleman@civicrm.org>
Mon, 23 Nov 2015 16:03:51 +0000 (11:03 -0500)
committercolemanw <coleman@civicrm.org>
Mon, 23 Nov 2015 16:03:51 +0000 (11:03 -0500)
Crm 17586 master


Trivial merge