From: Ulf Jasper <ulf.jasper@web.de>
Date: Wed, 17 Dec 2014 19:54:28 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2635^2~50
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c17c864e7a71e267b7496afbe1d7076cca283cd7;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---

c17c864e7a71e267b7496afbe1d7076cca283cd7