From: Noah Friedman <friedman@splode.com>
Date: Mon, 17 Aug 2015 20:00:36 +0000 (-0700)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~1373
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a84225d29c40a8cf3f860d2b58517102eef33436;p=emacs.git

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

a84225d29c40a8cf3f860d2b58517102eef33436