From: Joakim Verona <joakim@verona.se>
Date: Wed, 4 Feb 2015 20:46:19 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0abae34e8a0e19c9647ed24174b082a69c24535;p=emacs.git

merge master
---

d0abae34e8a0e19c9647ed24174b082a69c24535