From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 18:22:04 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2716
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95bca19164fe48c16e5ba04fcf6e6ddd9a22e819;p=emacs.git

merge from trunk
---

95bca19164fe48c16e5ba04fcf6e6ddd9a22e819