From: John Wiegley <johnw@newartisans.com>
Date: Wed, 29 Nov 2017 15:57:29 +0000 (-0800)
Subject: Merge branch 'master' into 520
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~1745^2~15^2~236^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9870843e1c;p=emacs.git

Merge branch 'master' into 520
---

9870843e1c68bde8f686ebe5e57204926a4634cc