Merge branch 'master' of git.framasoft.org:com-informatimago/emacs

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-09-26 21:58:44
Author local date 2018-09-26 23:58:44 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-09-26 21:58:44
Committer local date 2018-09-26 23:58:44 +0200
Commit 62542de67776d0da23a57222904d35a494996a37
Tree dd4a2d8725387e0045fb89427338513c01ab9246
Parent bbd8465107f8000eaa960c95afec703cdd36ca01
Parent ad66d40566920537cc5accc63a8e54ad0b2545e7
Merge branch 'master' of git.framasoft.org:com-informatimago/emacs
ViewGit