From: colemanw <coleman@civicrm.org>
Date: Sun, 31 Aug 2014 09:21:21 +0000 (+0100)
Subject: Merge pull request #4005 from civicrm/4.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f4fc101b0f60477f3a8f3f1b6eac43a805a1f320;p=civicrm-core.git

Merge pull request #4005 from civicrm/4.5

Partially revert 5dac229eb87
---

f4fc101b0f60477f3a8f3f1b6eac43a805a1f320