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

merge from trunk
---

3525167e356666b1d0ffc9c18d6e429174168deb