From: Joakim Verona <joakim@verona.se>
Date: Sat, 9 Jan 2016 15:42:04 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d824cc5e79e7d29a01929a51dfd673a117c77e8;p=emacs.git

merge master
---

0d824cc5e79e7d29a01929a51dfd673a117c77e8