Merge tag '4.6.17' of https://github.com/civicrm/civicrm-core into 4.6.17-fsf
authork054 <k@fsf.org>
Fri, 3 Jun 2016 12:09:22 +0000 (08:09 -0400)
committerk054 <k@fsf.org>
Fri, 3 Jun 2016 12:09:22 +0000 (08:09 -0400)
commite4db12abe90ec281b7fee5e714799ef3927cc36d
treed192301eea9cd76a469cb71fb94042cc8095b3a1
parent71f52f1b6adc6bdf5941f186d0655f33eed44316
parenta3e067500b2ec629a70c15a6d8c79e33ac1ac351
Merge tag '4.6.17' of https://github.com/civicrm/civicrm-core into 4.6.17-fsf
CRM/Contact/BAO/GroupContactCache.php
CRM/Contribute/BAO/Contribution.php