Merge emacs (1:25.2+1-11+rpi1) import into refs/heads/workingbranch
authorPeter Michael Green <plugwash@raspbian.org>
Fri, 14 Sep 2018 11:26:52 +0000 (12:26 +0100)
committerPeter Michael Green <plugwash@raspbian.org>
Fri, 14 Sep 2018 11:26:52 +0000 (12:26 +0100)

Trivial merge