From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 05:34:43 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2697
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=681bd2a1dd602397646a7382ae72c5f622c0946c;p=emacs.git

merge from trunk
---

681bd2a1dd602397646a7382ae72c5f622c0946c