From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 14:31:56 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2795
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6642817a6e9746bfc25e6e6b9488c9553530875c;p=emacs.git

merge from trunk
---

6642817a6e9746bfc25e6e6b9488c9553530875c