From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 11 Aug 2015 17:16:51 +0000 (-0400)
Subject: Merge branch '4.6' into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=787f988595ffd7ff1f3e810f5c0598061cc561e3;p=civicrm-core.git

Merge branch '4.6' into master

Conflicts:
	CRM/Member/Form/Membership.php
---

787f988595ffd7ff1f3e810f5c0598061cc561e3