From: Joakim Verona <joakim@verona.se>
Date: Tue, 24 Feb 2015 12:53:37 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8cffeb5e4d548398c5c8c26e191e6f237c47cf2b;p=emacs.git

merge master
---

8cffeb5e4d548398c5c8c26e191e6f237c47cf2b