From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 03:16:38 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2749
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d72cbde8b1a6b9b391a1966fe54def9b56c9746;p=emacs.git

merge from trunk
---

9d72cbde8b1a6b9b391a1966fe54def9b56c9746