From: Joakim Verona <joakim@verona.se>
Date: Wed, 28 Oct 2015 22:50:37 +0000 (+0100)
Subject: upstream merge
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ecc62076c4094c8712d471100b8955e88619bec;p=emacs.git

upstream merge
---

7ecc62076c4094c8712d471100b8955e88619bec