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

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-10-04 23:55:02
Author local date 2018-10-05 01:55:02 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-10-04 23:55:02
Committer local date 2018-10-05 01:55:02 +0200
Commit ef330196b9a5a72cfbc6784fb9bc446fb3ee7ec4
Tree 39f7a9760ca917c0feb8d187d06e1d66ed174d2e
Parent 62542de67776d0da23a57222904d35a494996a37
Parent 269b64464327671ae944af68ac3cdac4b2e00059
Merge branch 'master' of git.framasoft.org:com-informatimago/emacs
ViewGit