From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 07:32:39 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2656
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=525dcfd1238cb67857cfe816ecb2e7a3c5585c3d;p=emacs.git

merge from trunk
---

525dcfd1238cb67857cfe816ecb2e7a3c5585c3d