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

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-11-05 11:49:43
Author local date 2018-11-05 12:49:43 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-11-05 11:49:43
Committer local date 2018-11-05 12:49:43 +0100
Commit fad8aff49a6e666d73e75e1136a06627f4a31631
Tree 0f7a1bfd594c74a6ee90261c25d3e2a881e849e0
Parent ef330196b9a5a72cfbc6784fb9bc446fb3ee7ec4
Parent 945196b5660a5621c973461e9a5cc6896b57ae9f
Merge branch 'master' of git.framasoft.org:com-informatimago/emacs
ViewGit