From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 30 Mar 2015 00:03:07 +0000 (-0400)
Subject: Merge branch 4.6 into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c15fb38374462a40d704d83fac983412df8a16a1;p=civicrm-core.git

Merge branch 4.6 into master

Conflicts:
	CRM/Utils/Api.php
---

c15fb38374462a40d704d83fac983412df8a16a1