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

merge from trunk
---

7f502f7b6fc418af15408709cad4dc3dda8db583