Merge tag '4.6.18' of https://github.com/civicrm/civicrm-core into 4.6.18-fsf
authork054 <k@fsf.org>
Thu, 30 Jun 2016 18:32:27 +0000 (13:32 -0500)
committerk054 <k@fsf.org>
Thu, 30 Jun 2016 18:32:27 +0000 (13:32 -0500)
commit1fb2ed909157c601f043107f1375422b83131bd4
tree7e71dee77cc1ab493bd682c005a08a4b0262717b
parentb79a221d2b9f793f2bc792f1899f13e44cac9b33
parent2028a85b3e438e27bf608b231d3072cf916b9d29
Merge tag '4.6.18' of https://github.com/civicrm/civicrm-core into 4.6.18-fsf
CRM/Contact/BAO/GroupContactCache.php