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

merge from trunk
---

f20bcfe4144569d46d5e25685456af50820719f7