From: Joakim Verona <joakim@verona.se>
Date: Sun, 25 Jan 2015 01:11:31 +0000 (+0100)
Subject: merge master
X-Git-Tag: emacs-25.0.90~2582
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5087278b9bcab5847ce63d80c0d74c27f50e719;p=emacs.git

merge master
---

e5087278b9bcab5847ce63d80c0d74c27f50e719