From: Alan Mackenzie <acm@muc.de>
Date: Fri, 23 Dec 2016 20:28:21 +0000 (+0000)
Subject: Merge branch 'master' into comment-cache
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=441e3b78c7b4a874e98bbc436f2b8d9771ca9d4e;p=emacs.git

Merge branch 'master' into comment-cache
---

441e3b78c7b4a874e98bbc436f2b8d9771ca9d4e