From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 16:12:24 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2685
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41c0d73a318ece49776f1131a99e71253f953689;p=emacs.git

merge from trunk
---

41c0d73a318ece49776f1131a99e71253f953689