Merge branch 'VAT-572' of github.com:Parag18/civicrm-core into Parag18-VAT-572
authorPradeep Nayak <pradeep.nayak@webaccess.co.in>
Wed, 6 Aug 2014 15:54:59 +0000 (21:24 +0530)
committerPradeep Nayak <pradeep.nayak@webaccess.co.in>
Wed, 6 Aug 2014 15:54:59 +0000 (21:24 +0530)
commit3bd20e3f1717d6fa78ab919fa466ec0a517748b0
tree62325164a67675ac4d6ea9d358e6a78ffd440b73
parent6dcae13c90740fedce223bf97d4ad35c9a29fa13
parentd9e4ebe7ba6ede6c7223f092df0aec927b091201
Merge branch 'VAT-572' of github.com:Parag18/civicrm-core into Parag18-VAT-572

Conflicts:
CRM/Admin/Form/Preferences/Contribute.php
CRM/Price/BAO/PriceField.php
templates/CRM/Price/Form/PriceSet.tpl
CRM/Admin/Form/Preferences/Contribute.php
CRM/Contribute/Form/Contribution.php
CRM/Core/BAO/MessageTemplate.php
CRM/Event/Form/Participant.php
CRM/Event/Form/Registration/Confirm.php
CRM/Member/Form/Membership.php
CRM/Price/BAO/LineItem.php
CRM/Price/BAO/PriceField.php
templates/CRM/Contribute/Page/UserDashboard.tpl
templates/CRM/Price/Form/PriceSet.tpl