From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Jan 2015 13:54:25 +0000 (+0100)
Subject: merge master
X-Git-Tag: emacs-25.0.90~2603
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d;p=emacs.git

merge master
---

0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d