From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 14:17:49 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2686
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e9d8fea04e2d22ba8c6b238444f04d654492fa76;p=emacs.git

merge from trunk
---

e9d8fea04e2d22ba8c6b238444f04d654492fa76