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

merge from trunk
---

d4082b3d476bb73173680e6bdb361a90f9e6067c