Merge branch 'master' of /home/acm/emacs/emacs.git/master
commitcaf9e31d714dc817118e2549557fdda3d28a4c2b
authorAlan Mackenzie <acm@muc.de>
Tue, 30 May 2017 16:27:36 +0000 (30 16:27 +0000)
committerAlan Mackenzie <acm@muc.de>
Tue, 30 May 2017 16:27:36 +0000 (30 16:27 +0000)
tree2264bf1f0ccd57298e9f8dc841a10e5bac7a52e0
parentaeaef62cfd8e9b0d36e4125322e926e48ab9091a
parent91a52e38e5194f19f0d44ae4c2ad88565b28a196
Merge branch 'master' of /home/acm/emacs/emacs.git/master