Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-22-22-01-44
authorkurund <kurund@civicrm.org>
Mon, 22 Dec 2014 16:31:51 +0000 (22:01 +0530)
committerkurund <kurund@civicrm.org>
Mon, 22 Dec 2014 16:31:51 +0000 (22:01 +0530)
commite44431fee3e48e503e8500ace6206f2d25c8956f
tree3ec11ab398623ac26d7470cafceeecf421f9e20c
parent0e46df70e7f3719f71d83cc48507bd112c809a87
parent4cafb090f3fe9a53a63a30276283ba886177e1af
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-22-22-01-44
CRM/Activity/BAO/Activity.php
CRM/Core/Payment/PayPalImpl.php
CRM/Event/Form/Registration/Confirm.php