Merge branch '4.5' into 4.6

diff --cc CRM/Event/Form/EventFees.php
index 48b1cbff942ac84f2a72d1b458f42e5b58aeb905,e102ec4831d28a440aa4957fff49bd89e928115e..cb7d423b381f76d0d57db99b81965dc0cbbdbe76
--- 1/CRM/Event/Form/EventFees.php
--- 2/CRM/Event/Form/EventFees.php
+++ b/CRM/Event/Form/EventFees.php
@@@ -401,10 -391,9 +401,10 @@@ SELECT  id, html_typ
          $element = $form->add('select', 'discount_id',
            ts('Discount Set'),
            array(
 -            0 => ts('- select -')) + $discounts,
 +            0 => ts('- select -'),
 +          ) + $discounts,
            FALSE,
-           array('onchange' => "buildFeeBlock( {$form->_eventId}, this.value );")
+           array('class' => "crm-select2")
          );
  
          if ($form->_online) {

diff --cc templates/CRM/Event/Form/Participant.tpl
Simple merge