Merge pull request #5998 from seamuslee001/CRM-16600-4.6
authorcolemanw <coleman@civicrm.org>
Fri, 19 Jun 2015 01:58:19 +0000 (21:58 -0400)
committercolemanw <coleman@civicrm.org>
Fri, 19 Jun 2015 01:58:19 +0000 (21:58 -0400)
Crm 16600 4.6


Trivial merge