From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 14 Nov 2015 11:02:35 +0000 (+0200)
Subject: Merge branch 'master' into emacs-25
X-Git-Tag: emacs-25.0.90~803
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f234fc2cb319de1e5e2eca1a84450ec220ce7955;p=emacs.git

Merge branch 'master' into emacs-25
---

f234fc2cb319de1e5e2eca1a84450ec220ce7955