Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commitc17c864e7a71e267b7496afbe1d7076cca283cd7
authorUlf Jasper <ulf.jasper@web.de>
Wed, 17 Dec 2014 19:54:28 +0000 (17 20:54 +0100)
committerUlf Jasper <ulf.jasper@web.de>
Wed, 17 Dec 2014 19:54:28 +0000 (17 20:54 +0100)
tree4aa3374301a7e09c6ca6d8e6909ad285092468e1
parent197a9e0c9e0c73ea5e76c10980e6265dd99439d9
parent9be1538571e420b5a7bc7e93006cea1c1b47790e
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs