From: Joakim Verona <joakim@verona.se>
Date: Thu, 26 Feb 2015 13:43:51 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f61f2029fc4bf91e9e6fa32570209cf4446a103c;p=emacs.git

merge master
---

f61f2029fc4bf91e9e6fa32570209cf4446a103c