From: Alan Mackenzie <acm@muc.de>
Date: Mon, 15 Dec 2014 12:07:18 +0000 (+0000)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2635^2~65
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=816c1dfc5dfc6d490c653b393ef6876b3f04b7fe;p=emacs.git

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

816c1dfc5dfc6d490c653b393ef6876b3f04b7fe