Merge pull request #7458 from davecivicrm/CRM-17702
authorDave Greenberg <dave@civicrm.org>
Thu, 17 Dec 2015 17:59:15 +0000 (09:59 -0800)
committerDave Greenberg <dave@civicrm.org>
Thu, 17 Dec 2015 17:59:15 +0000 (09:59 -0800)
CRM-17702 - fix for 4.6.


Trivial merge