Merge branch 'master' of https://github.com/informatimago/emacs

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-12-10 10:10:35
Author local date 2018-12-10 11:10:35 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-12-10 10:10:35
Committer local date 2018-12-10 11:10:35 +0100
Commit 377612c1d1f0bd479e990b9010edf2f4fbda8e20
Tree ee0bdce3296fc554dde98d554ee1657c7a60e639
Parent 5baed31c7f2e1905b2888e18212cff5524802966
Parent 1ce8de68262c0a8e2bf3804b1c859de4a017ddfb
Merge branch 'master' of https://github.com/informatimago/emacs
ViewGit