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

merge from trunk
---

d400d0f25c3c9df2e9c1d26432b144779c81a684