Merge tag '4.6.8' into localtmp
authorLisa Marie Maginnis <lisam@fsf.org>
Mon, 21 Sep 2015 18:12:50 +0000 (14:12 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Mon, 21 Sep 2015 18:12:50 +0000 (14:12 -0400)
commite977de5b9438f45873c58a871ae6759f1fc88559
tree590cb955497bfdb77fa96c3f0fe0fc8ff6b0f91b
parent640aa1330752dda6c21b5c602ed4abf3632f18e3
parent2717c8a52601804ca65b8a58ca439feb7b85b62e
Merge tag '4.6.8' into localtmp

Conflicts:
CRM/Contact/BAO/Contact.php
CRM/Contact/Task.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Task.php
CRM/Core/Resources.php
CRM/Import/Parser.php
CRM/Member/Form/MembershipBlock.php
CRM/Price/BAO/PriceSet.php
CRM/Utils/PDF/Utils.php
api/v3/Contact.php
api/v3/Contribution.php
templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
templates/CRM/Member/Form/Membership.tpl
20 files changed:
CRM/ACL/BAO/Cache.php
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/BAO/GroupContact.php
CRM/Contact/BAO/GroupContactCache.php
CRM/Contact/Task.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Task.php
CRM/Core/Resources.php
CRM/Event/BAO/Participant.php
CRM/Import/Parser.php
CRM/Member/BAO/Membership.php
CRM/Price/BAO/PriceSet.php
CRM/Utils/PDF/Utils.php
CRM/Utils/Token.php
api/v3/Contact.php
api/v3/Contribution.php
templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl