From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 05:57:09 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2677
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49b24704f6762c8600cdcd829d8874ed4a1a69c8;p=emacs.git

merge from trunk
---

49b24704f6762c8600cdcd829d8874ed4a1a69c8