Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/emacs

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2017-01-24 22:56:53
Author local date 2017-01-24 23:56:53 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2017-01-24 22:56:53
Committer local date 2017-01-24 23:56:53 +0100
Commit 03f155a2d895e8ef43fa7e08177d279b9404dbc3
Tree 30d096a3c0c01c88b0aec40a13e365e209507ae3
Parent fdaa0528e08a73bf80217af3cbf6531f7b2fb775
Parent b87900d41f82cc9322df9013da3d381cc211f34b
Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/emacs
ViewGit