Merge pull request #7179 from davecivicrm/CRM-14732
authorDave Greenberg <dave@civicrm.org>
Fri, 13 Nov 2015 17:44:42 +0000 (09:44 -0800)
committerDave Greenberg <dave@civicrm.org>
Fri, 13 Nov 2015 17:44:42 +0000 (09:44 -0800)
CRM-14732


Trivial merge