From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 07:16:29 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2863
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b4c71fb6ca9382bee1dfa6996b7a5d67f469880;p=emacs.git

merge from trunk
---

0b4c71fb6ca9382bee1dfa6996b7a5d67f469880