From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 13 Nov 2014 22:12:32 +0000 (+0000)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2635^2~485
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0868bad993c725397d2034fdc8ab1c77ad8b03a0;p=emacs.git

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

0868bad993c725397d2034fdc8ab1c77ad8b03a0