Merge tag '4.6.29' of https://github.com/civicrm/civicrm-core into 4.6.29-fsf 4.6.29-fsf
authorAndrew Engelbrecht <andrew@fsf.org>
Mon, 10 Jul 2017 16:08:10 +0000 (12:08 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Mon, 10 Jul 2017 16:08:10 +0000 (12:08 -0400)
commitf712b97e8af3b9fe278f37c8d5459ea5e5c8e05b
tree63becea9767dceab12fced36985a733cdfb2e24f
parent9bf436785ff042c8f9db7bc89e40b3476f6da867
parent6a415ccc0ea8f2c050e181d2c2cbd902567a761e
Merge tag '4.6.29' of https://github.com/civicrm/civicrm-core into 4.6.29-fsf
CRM/Member/BAO/Membership.php
api/v3/Contact.php