Merge branch '4.5' into 4.6
authorColeman Watts <coleman@civicrm.org>
Thu, 12 Mar 2015 15:31:43 +0000 (11:31 -0400)
committerColeman Watts <coleman@civicrm.org>
Thu, 12 Mar 2015 15:31:43 +0000 (11:31 -0400)
commite7ed2ed6dfa73a6225b7d2a2d09529edec03f974
treee68f3e441ff0c007d61a82e5754473f42fd90dda
parent8133915958883f870b6b35ea5545a195430cd10c
parent34eda310dd5402765cdb6131a67a6d65a18f3d8b
Merge branch '4.5' into 4.6
CRM/Event/Form/EventFees.php
templates/CRM/Event/Form/Participant.tpl