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

merge from trunk
---

dd30d6b73383df67468e4705492206bae6a8185c