From: Joakim Verona <joakim@verona.se>
Date: Mon, 9 Feb 2015 11:42:36 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d143ea4db0021a9fb3f6148adc8a177822e98a7;p=emacs.git

merge master
---

7d143ea4db0021a9fb3f6148adc8a177822e98a7