From: John Wiegley <johnw@newartisans.com>
Date: Mon, 4 Dec 2017 20:10:26 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~1745^2~15^2~158
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=08e5406cc3fe78899be86bc1cd8ca26afbb728ac;p=emacs.git

Merge branch 'master' into next
---

08e5406cc3fe78899be86bc1cd8ca26afbb728ac