Merge remote branch 'canonical/master' into merge-20140930
authordpradeep <pradeep.dorugade@webaccess.co.in>
Tue, 30 Sep 2014 07:43:26 +0000 (13:13 +0530)
committerdpradeep <pradeep.dorugade@webaccess.co.in>
Tue, 30 Sep 2014 07:43:26 +0000 (13:13 +0530)
commit3b5db8ce04c503155f5c198957730504d1dabe06
treef5933253eb355239b2f91ea2ba7a9af6538b3aea
parent22b541fb37fd21faab4b4ada5852422cde5ccc2b
parentf3e103be0599b96b3cb36b8f64841c82719478cd
Merge remote branch 'canonical/master' into merge-20140930

Conflicts:
CRM/Event/BAO/Participant.php
CRM/Member/BAO/Membership.php
CRM/Price/BAO/PriceSet.php
sql/civicrm_generated.mysql
templates/CRM/Price/Page/Field.tpl
templates/CRM/Price/Page/Option.tpl
36 files changed:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/BAO/ContributionPage.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/Contribution/ThankYou.php
CRM/Contribute/Form/ContributionBase.php
CRM/Core/BAO/MessageTemplate.php
CRM/Core/Payment/Form.php
CRM/Event/BAO/Participant.php
CRM/Event/Form/EventFees.php
CRM/Event/Form/Participant.php
CRM/Event/Form/Registration.php
CRM/Event/Form/Registration/Confirm.php
CRM/Event/Form/Registration/Register.php
CRM/Financial/Page/AJAX.php
CRM/Member/BAO/Membership.php
CRM/Member/Form/Membership.php
CRM/Price/BAO/LineItem.php
CRM/Price/BAO/PriceSet.php
CRM/Price/Page/Field.php
CRM/Price/Page/Option.php
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
api/v3/Contribution.php
api/v3/LineItem.php
css/civicrm.css
templates/CRM/Contribute/Form/Contribution.tpl
templates/CRM/Contribute/Form/Contribution/Confirm.tpl
templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
templates/CRM/Event/Form/ManageEvent/Fee.tpl
templates/CRM/Event/Page/EventInfo.tpl
templates/CRM/Price/Page/Field.tpl
templates/CRM/Price/Page/Option.tpl
xml/templates/civicrm_data.tpl
xml/templates/civicrm_navigation.tpl