Merge branch 'VAT-638' of github.com:Parag18/civicrm-core into Parag18-VAT-638
authorPradeep Nayak <pradeep.nayak@webaccess.co.in>
Wed, 6 Aug 2014 16:02:50 +0000 (21:32 +0530)
committerPradeep Nayak <pradeep.nayak@webaccess.co.in>
Wed, 6 Aug 2014 16:02:50 +0000 (21:32 +0530)
commit6fb35ace2e95e84c53051422aa8c1a7398069a9b
tree20b99eb9925cec92d8ed594d0614387e4136578c
parent3bd20e3f1717d6fa78ab919fa466ec0a517748b0
parent9148c27748f9263baf0d6c3b56208ac33f55d3c4
Merge branch 'VAT-638' of github.com:Parag18/civicrm-core into Parag18-VAT-638

Conflicts:
CRM/Admin/Form/Preferences/Contribute.php
CRM/Admin/Form/Preferences/Contribute.php