From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 10 Feb 2015 07:55:14 +0000 (+0000)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2008^2~34
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2dacd0a7eee1f8fdff028e15ff40640d005c71d7;p=emacs.git

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

2dacd0a7eee1f8fdff028e15ff40640d005c71d7