From: Alan Mackenzie <acm@muc.de>
Date: Thu, 10 Mar 2016 16:21:47 +0000 (+0000)
Subject: Merge branch 'master' into comment-cache
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=345cb4c37b0093cf607edff41937c86d24b9200c;p=emacs.git

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

345cb4c37b0093cf607edff41937c86d24b9200c