From: Eileen McNaughton Date: Fri, 10 Jul 2015 08:04:26 +0000 (+1200) Subject: Merge pull request #6184 from eileenmcnaughton/master X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ac5e0a78f277ccfa22603cbf858408c9538b364c;p=civicrm-core.git Merge pull request #6184 from eileenmcnaughton/master Merge branch '4.6' of https://github.com/civicrm/civicrm-core --- ac5e0a78f277ccfa22603cbf858408c9538b364c