From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 22 Aug 2016 06:41:31 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-26.0.90~1712
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aed22ca32344c21c5868a451d1afe969642a3ba5;p=emacs.git

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

aed22ca32344c21c5868a451d1afe969642a3ba5