Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-21-15-20-57
authorkurund <kurund@civicrm.org>
Tue, 21 Oct 2014 22:21:03 +0000 (15:21 -0700)
committerkurund <kurund@civicrm.org>
Tue, 21 Oct 2014 22:21:03 +0000 (15:21 -0700)
commit3db4e3ce32f2e3429ac796449fc4e13e6bab7e5f
tree98d54990c4b5a34549bc1a0bbf40caf8e5ba6ece
parent32eaac87319eb01b63b55ea4ddf68eae644199ca
parent440041eacddbaa3c809524401ff24debbb582199
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-21-15-20-57
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Core/BAO/ActionSchedule.php
CRM/Event/Form/Participant.php
CRM/Event/Page/EventInfo.php
CRM/Member/Form/Membership.php
api/v3/Contribution.php
css/civicrm.css
templates/CRM/Event/Page/EventInfo.tpl