From: Joakim Verona <joakim@verona.se>
Date: Thu, 22 Jan 2015 11:52:42 +0000 (+0100)
Subject: merge master
X-Git-Tag: emacs-25.0.90~2584
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5693f3de69f9db99252b2f4eb1c7178fdec2a210;p=emacs.git

merge master
---

5693f3de69f9db99252b2f4eb1c7178fdec2a210