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

merge from trunk
---

c4dfb6946f22b7b02a9df33708cb2b0d71ba21ac