From: colemanw <coleman@civicrm.org>
Date: Mon, 25 Aug 2014 09:08:53 +0000 (+0100)
Subject: Merge pull request #3934 from civicrm/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4a18ea04fcdddbb8badc1c7f878d0b338c48f26d;p=civicrm-core.git

Merge pull request #3934 from civicrm/master

Merge master into 4.5
---

4a18ea04fcdddbb8badc1c7f878d0b338c48f26d