Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commit40a33a3cb711f894ac61691c03cc13e58bc38145
authorMichael Albinus <michael.albinus@gmx.de>
Sun, 2 Apr 2017 09:03:14 +0000 (2 11:03 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Sun, 2 Apr 2017 09:03:14 +0000 (2 11:03 +0200)
tree27fcb032eb04a20bd57b412b2120d357f28ab7fa
parent59191cd0cbe8463f9095a71cb4048bb138d6e446
parenta184a7edc58e1e053aa317a0f162df7e225597e1
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs