Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commit65a3808fcf0afbd90d3ae512ff1ae4395bb2ee69
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 31 Oct 2015 13:42:28 +0000 (31 14:42 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 31 Oct 2015 13:42:28 +0000 (31 14:42 +0100)
treee71e092e1d19a6575003770abd3dea981fa47e27
parent547a23469a20b7fa90c9a3554b8f7fb58fe100ab
parent553d7e9b384b9c9a8500c5229e1dbc76002d5a10
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs