projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e6d6b9 c7e7164)
Merge pull request #7319 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 26 Nov 2015 21:02:04 +0000 (10:02 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Thu, 26 Nov 2015 21:02:04 +0000 (10:02 +1300)
Partial merge of 4.6 to master


Trivial merge