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

author kurund <kurund@civicrm.org>

Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)

committer kurund <kurund@civicrm.org>

Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)
author kurund <kurund@civicrm.org>
Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)
committer kurund <kurund@civicrm.org>
Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)
diff --cc CRM/Contribute/BAO/Contribution/Utils.php
Simple merge
diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge
diff --cc CRM/Core/Payment/PayPalImpl.php
Simple merge
author	kurund <kurund@civicrm.org>
	Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)
committer	kurund <kurund@civicrm.org>
	Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)
		1	2
CRM/Contribute/BAO/Contribution/Utils.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Contribute/Form/Contribution/Confirm.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Core/Payment/PayPalImpl.php	patch \|	diff1 \|	diff2 \|	blob \| history