Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-07-19-33-29
authorkurund <kurund@civicrm.org>
Tue, 7 Oct 2014 14:03:35 +0000 (19:33 +0530)
committerkurund <kurund@civicrm.org>
Tue, 7 Oct 2014 14:03:35 +0000 (19:33 +0530)
commitf7ba9bc4e90b4b053e77d4408dd4ce215e2b19a6
tree8314fc7ce4672dee389557d908f6010899a6129f
parent830556673a8d49956c985387b76d98f669f451b3
parent76bd3c79203d04ea7899afbdcf93088b335fc565
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-07-19-33-29
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Core/BAO/ActionSchedule.php
CRM/Event/Form/Participant.php