From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 07:16:32 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2775
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=851186e371a32446e3425360113009dbe3198537;p=emacs.git

merge from trunk
---

851186e371a32446e3425360113009dbe3198537