From: Joakim Verona <joakim@verona.se>
Date: Wed, 30 Sep 2015 10:54:26 +0000 (+0200)
Subject: upstream merge
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2cd0e6d0cf2a83d10b21398398789b4579156b71;p=emacs.git

upstream merge
---

2cd0e6d0cf2a83d10b21398398789b4579156b71