From: kurund <kurund@civicrm.org>
Date: Wed, 25 Feb 2015 05:59:58 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-25-11-27-40
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f377f10d244045a52b5891bdeedc823b3988bd7c;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-25-11-27-40

Conflicts:
	CRM/Contribute/BAO/Contribution/Utils.php
---

f377f10d244045a52b5891bdeedc823b3988bd7c