From: colemanw <coleman@civicrm.org>
Date: Wed, 29 Apr 2015 02:28:04 +0000 (-0600)
Subject: Merge pull request #5723 from civicrm/4.6
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f8ed78d3025f0d16204ed8a665bb40e96fba1d49;p=civicrm-core.git

Merge pull request #5723 from civicrm/4.6

Merge branch 4.6 into master
---

f8ed78d3025f0d16204ed8a665bb40e96fba1d49