Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-21-15-20-57

diff --cc CRM/Contribute/BAO/Contribution/Utils.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution/Main.php
Simple merge

diff --cc CRM/Core/BAO/ActionSchedule.php
Simple merge

diff --cc CRM/Event/Form/Participant.php
Simple merge

diff --cc CRM/Event/Page/EventInfo.php
Simple merge

diff --cc CRM/Member/Form/Membership.php
Simple merge

diff --cc api/v3/Contribution.php
Simple merge

diff --cc css/civicrm.css
index f5e660ccba27efe6590e73284698833523335816,9b5b42b7a05a948d00f7ddfeb62095ac3f8f544c..528c26985985e4bf7825724c13785f4f1885fb0b
--- 1/css/civicrm.css
--- 2/css/civicrm.css
+++ b/css/civicrm.css
@@@ -4539,27 -4523,3 +4538,27 @@@ span.crm-status-icon 
  .crm-container .blockUI.blockOverlay {
    background: url("../i/loading-overlay.gif") center center no-repeat white !important;
  }
- }
 +
 +/* Recurring Dialog */
 +.crm-container .recurring-dialog-inner-wrapper {
 +  display: inline-block;
 +  width: 100%;
 +}
 +.crm-container .recurring-dialog-inner-left{
 +  width: 30%;
 +  float: left;
 +}
 +.crm-container .recurring-dialog-inner-right{
 +  width: 70%;
 +  float: left;
 +}
 +.crm-container .recurring-dialog-button{
 +  background: #f5f5f5;
 +  background-image: -webkit-linear-gradient(top,#f5f5f5,#f1f1f1);
 +  border: 1px solid rgba(0,0,0,0.1);
 +  padding: 5px 8px;
 +  text-align: center;
 +  border-radius: 2px;
 +  cursor: pointer;  
 +  font-size: 11px !important;
++}

diff --cc templates/CRM/Event/Page/EventInfo.tpl
Simple merge