Merge pull request #5617 from colemanw/CRM-15916
authorcolemanw <coleman@civicrm.org>
Fri, 10 Apr 2015 21:30:35 +0000 (17:30 -0400)
committercolemanw <coleman@civicrm.org>
Fri, 10 Apr 2015 21:30:35 +0000 (17:30 -0400)
commit9768c5b7cc7c97fc09dbfec606fd6417d396ca7a
treec5f6dfeaff3935d904a0c45b5f58dfedd314a792
parent1ed1693c38987e9aa43a0ceeabae5bb094fd73bb
parent909746920753af74b9af09389d7e76de47ad8360
Merge pull request #5617 from colemanw/CRM-15916

CRM-15916 - Revert bad merge