projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b915aa ec9a32f)
Merge pull request #6072 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 23 Jun 2015 13:48:49 +0000 (01:48 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 23 Jun 2015 13:48:49 +0000 (01:48 +1200)
Merge 4.6 to master


Trivial merge