projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71b5171 579a1fb)
Merge pull request #6184 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 10 Jul 2015 08:04:26 +0000 (20:04 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Fri, 10 Jul 2015 08:04:26 +0000 (20:04 +1200)
Merge branch '4.6' of https://github.com/civicrm/civicrm-core


Trivial merge