From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 4 Jul 2015 02:00:22 +0000 (-0400)
Subject: Merge branch '4.6' into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b9331a134ecb82fb7a084ec3326896cca41f0758;p=civicrm-core.git

Merge branch '4.6' into master
---

b9331a134ecb82fb7a084ec3326896cca41f0758