Merge pull request #5384 from davecivicrm/CRM-16108
authorDave Greenberg <dave@civicrm.org>
Fri, 13 Mar 2015 22:08:26 +0000 (15:08 -0700)
committerDave Greenberg <dave@civicrm.org>
Fri, 13 Mar 2015 22:08:26 +0000 (15:08 -0700)
CRM-16108 - Backport to 4.6.


Trivial merge