Merge branch 'master' of github.com:webaccess/civicrm-core into sales-tax
authorkurund <kurund@civicrm.org>
Thu, 2 Oct 2014 09:35:36 +0000 (10:35 +0100)
committerkurund <kurund@civicrm.org>
Thu, 2 Oct 2014 09:35:36 +0000 (10:35 +0100)
commit21a3b46eba2d03213682bcb91ee5574b264f31aa
treef5065e0c96c590b6dea3f00b02af1f8e806bac24
parente5235b0439de1bece3acb8bca950cf3db8c46100
parent115fa278537e76b225860f168de81aee82b135fe
Merge branch 'master' of github.com:webaccess/civicrm-core into sales-tax

Conflicts:
api/v3/Contribution.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Event/BAO/Participant.php
CRM/Member/BAO/Membership.php
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
api/v3/Contribution.php
css/civicrm.css
templates/CRM/Contribute/Form/Contribution.tpl