From: kurund <kurund@civicrm.org>
Date: Mon, 1 Jun 2015 17:08:20 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-01-22-27-06
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=991466ed3caa6bc4ee96b4d8a2e0b4b6b1efcd93;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-01-22-27-06

Conflicts:
	CRM/Contribute/Form/Contribution/Main.php
---

991466ed3caa6bc4ee96b4d8a2e0b4b6b1efcd93