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)
commitf4fc101b0f60477f3a8f3f1b6eac43a805a1f320
tree65e9b11627e83a6cfdc4ce433709c12fa4e3f910
parente0d8d524696e21fcdf379daae3d65fc7ad7523f0
parent0cc040cf170384fba98690f79e5440971226d171
Merge pull request #4005 from civicrm/4.5

Partially revert 5dac229eb87