Merge tag '4.6.33' of https://github.com/civicrm/civicrm-core into 4.6.33-fsf 4.6.33-fsf
authorAndrew Engelbrecht <andrew@fsf.org>
Thu, 2 Nov 2017 22:10:12 +0000 (18:10 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Thu, 2 Nov 2017 22:10:12 +0000 (18:10 -0400)
commit03f9b4176d6e34f2010acb99bd26241a85e84727
tree48be56ea686544f1dd8cce8db430cfe99404e0f9
parentd8459455862af62519350fa6172c1c6501c19636
parent26d288f800deb25fe2e61786133b43d7d9558a50
Merge tag '4.6.33' of https://github.com/civicrm/civicrm-core into 4.6.33-fsf
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Member/BAO/Membership.php
CRM/Utils/Token.php
api/v3/Contribution.php
templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl