Merge pull request #4005 from civicrm/4.5
authorcolemanw <coleman@civicrm.org>
Sun, 31 Aug 2014 09:21:21 +0000 (10:21 +0100)
committercolemanw <coleman@civicrm.org>
Sun, 31 Aug 2014 09:21:21 +0000 (10:21 +0100)
Partially revert 5dac229eb87


Trivial merge