Merge pull request #7262 from jaapjansma/CRM-17382
authorDave Greenberg <dave@civicrm.org>
Fri, 20 Nov 2015 18:52:06 +0000 (10:52 -0800)
committerDave Greenberg <dave@civicrm.org>
Fri, 20 Nov 2015 18:52:06 +0000 (10:52 -0800)
fixed #CRM-17382


Trivial merge