From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 26 Jan 2015 16:38:59 +0000 (-0500)
Subject: Merge branch 4.5 into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=414b3228db09432f1e389a89f9fb9e3f22d0f2da;p=civicrm-core.git

Merge branch 4.5 into master
---

414b3228db09432f1e389a89f9fb9e3f22d0f2da