From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 15:57:23 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2719
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ffb49902dad1e9f8ae8083732c395e4103ba0561;p=emacs.git

merge from trunk
---

ffb49902dad1e9f8ae8083732c395e4103ba0561