Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commit1b3e992e3945f19716f9088a26ce32807f07f301
authorMichael Albinus <michael.albinus@gmx.de>
Sun, 23 Nov 2014 09:01:18 +0000 (23 10:01 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sun, 23 Nov 2014 09:01:18 +0000 (23 10:01 +0100)
treec0d92cdb4a83a707fed648252b9d8bccce4ad61d
parent709a5173cd98d1e67724d1d02c437fa63681c3b6
parent9c3381106fa40ef7a6d41e09e8fab0e1553b088e
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs