From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Fri, 10 Apr 2015 00:07:15 +0000 (-0500)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2507
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36c0acaedd5f4646276e4edd7cb94248473d075a;p=emacs.git

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

36c0acaedd5f4646276e4edd7cb94248473d075a