From: Joakim Verona <joakim@verona.se>
Date: Tue, 20 Aug 2013 10:16:47 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2764
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd9b511aa5fc7194cec86398548f9e2afa0e435e;p=emacs.git

merge from trunk
---

dd9b511aa5fc7194cec86398548f9e2afa0e435e