From: Joakim Verona <joakim@verona.se>
Date: Sun, 18 Jan 2015 09:53:38 +0000 (+0100)
Subject: merge master
X-Git-Tag: emacs-25.0.90~2597
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=54efd2ab176dd6cc33bb1e86a9c37908c26d0a46;p=emacs.git

merge master
---

54efd2ab176dd6cc33bb1e86a9c37908c26d0a46