From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 May 2016 20:20:29 +0000 (-0700)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/9a834970e822db10bc887db343fd8561a3639a66

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---

9a834970e822db10bc887db343fd8561a3639a66