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)
CRM-15916 - Revert bad merge


Trivial merge