projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14bd5d1 9e25c29)
Merge pull request #6312 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 27 Jul 2015 23:17:36 +0000 (11:17 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 27 Jul 2015 23:17:36 +0000 (11:17 +1200)
Master


Trivial merge