From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 22 Nov 2014 11:38:21 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2635^2~389
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b559a60382a3e192250e533c4a9daecacabd4026;p=emacs.git

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

b559a60382a3e192250e533c4a9daecacabd4026