Merge pull request #6259 from systopia/CRM-16871
authorDave Greenberg <dave@civicrm.org>
Fri, 24 Jul 2015 16:14:33 +0000 (09:14 -0700)
committerDave Greenberg <dave@civicrm.org>
Fri, 24 Jul 2015 16:14:33 +0000 (09:14 -0700)
Proposed changes for CRM-16871


Trivial merge