From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 7 Oct 2015 18:51:50 +0000 (-0400)
Subject: Merge branch 4.6 into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=71f7de786e8da429b2e8d630cb3ec1bf02f529e9;p=civicrm-core.git

Merge branch 4.6 into master

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml
---

71f7de786e8da429b2e8d630cb3ec1bf02f529e9