From: Joakim Verona <joakim@verona.se>
Date: Fri, 11 Dec 2015 09:38:19 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a907470e2076c5e0b0313ee46ebf17f436b2493;p=emacs.git

merge master
---

5a907470e2076c5e0b0313ee46ebf17f436b2493