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

merge from trunk
---

9d6363e6a7ca3d8c89d8e1e92500793a56e749e6