From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 16:16:57 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2665
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98658022ba2ea2473882851839433647240655ad;p=emacs.git

merge from trunk
---

98658022ba2ea2473882851839433647240655ad