From: Joakim Verona <joakim@verona.se>
Date: Thu, 22 Jan 2015 07:27:13 +0000 (+0100)
Subject: merge master
X-Git-Tag: emacs-25.0.90~2585
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315;p=emacs.git

merge master
---

5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315