From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 12 Mar 2015 14:18:47 +0000 (-0400)
Subject: Merge branch '4.6' into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2b53ce7cacbc8e21bad50dcea4c899c5eb3fc15c;p=civicrm-core.git

Merge branch '4.6' into master
---

2b53ce7cacbc8e21bad50dcea4c899c5eb3fc15c