From: Joakim Verona <joakim@verona.se>
Date: Mon, 5 Oct 2015 15:07:45 +0000 (+0200)
Subject: upstream merge
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4041499975f671dfc0a052cdea8cb94a6176d745;p=emacs.git

upstream merge
---

4041499975f671dfc0a052cdea8cb94a6176d745