Merge pull request #6296 from JMAConsulting/CRM-16187
authorDave Greenberg <dave@civicrm.org>
Mon, 27 Jul 2015 19:00:46 +0000 (12:00 -0700)
committerDave Greenberg <dave@civicrm.org>
Mon, 27 Jul 2015 19:00:46 +0000 (12:00 -0700)
Crm 16187


Trivial merge