Merge tag '4.6.12' of https://github.com/civicrm/civicrm-core into 4.6.12-fsf
authork054 <kosa@riseup.net>
Thu, 4 Feb 2016 20:25:29 +0000 (15:25 -0500)
committerk054 <kosa@riseup.net>
Thu, 4 Feb 2016 20:25:29 +0000 (15:25 -0500)
commitc4e58e3e1ef467290252075ee5c2f6a63f190b3f
treeb3eee69a39851acf3b52cd3171ddd6465e76f938
parentab743828df44e46d86b6343f0ab69d49e85a6588
parenta3efb5e7a94c70c82ac1817255c3bc1c130b1ff1
Merge tag '4.6.12' of https://github.com/civicrm/civicrm-core into 4.6.12-fsf
CRM/Activity/BAO/Activity.php
CRM/Contribute/BAO/Contribution.php
CRM/Member/BAO/Membership.php
CRM/Utils/PDF/Utils.php
api/v3/Contribution.php