From: Francesc Rocher <francesc.rocher@gmail.com>
Date: Thu, 29 Jan 2015 23:38:31 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2572^2~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9242cdcda95e0fcb57233a8665d251e280eddec6;p=emacs.git

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

9242cdcda95e0fcb57233a8665d251e280eddec6