From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 28 Feb 2016 10:09:12 +0000 (+0100)
Subject: Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
X-Git-Tag: emacs-25.0.92~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=52f64cc;p=emacs.git

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

52f64cc2e74ab83752c8f2d37ef0fc6df5ef8b30