Merge emacs25 (25.2+1-5+rpi1) import into refs/heads/workingbranch
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 17 Aug 2017 18:29:59 +0000 (19:29 +0100)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 17 Aug 2017 18:29:59 +0000 (19:29 +0100)

Trivial merge