From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 15:01:31 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2852
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2da59f810184f36b4061eb422011de057bd0588e;p=emacs.git

merge from trunk
---

2da59f810184f36b4061eb422011de057bd0588e