From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 23 Nov 2014 09:01:18 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2635^2~377
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b3e992e3945f19716f9088a26ce32807f07f301;p=emacs.git

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

1b3e992e3945f19716f9088a26ce32807f07f301