Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-25-11-27-40
authorkurund <kurund@civicrm.org>
Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)
committerkurund <kurund@civicrm.org>
Wed, 25 Feb 2015 05:59:58 +0000 (11:29 +0530)
commitf377f10d244045a52b5891bdeedc823b3988bd7c
tree60aa564e4ba25bf7121d6964b5d4d01401326a4a
parent23725bc11f8df7163580c9e9b72f01250a4847b3
parent4e285a191c34924275d997de5d47baa2f8049b1e
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-25-11-27-40

Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Core/Payment/PayPalImpl.php