From: Joakim Verona <joakim@verona.se>
Date: Sun, 25 Aug 2013 20:27:21 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2730
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9049c89bd8d5fec8b7bc35298859445350e8679f;p=emacs.git

merge from trunk
---

9049c89bd8d5fec8b7bc35298859445350e8679f