From: Joakim Verona <joakim@verona.se>
Date: Sun, 27 Dec 2015 08:19:21 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d27e24a37b514e7c07c120cc4f3984ae3b0c53e;p=emacs.git

merge master
---

2d27e24a37b514e7c07c120cc4f3984ae3b0c53e