From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 07:11:51 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2658
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c9c017cab31011b22218785d48b2bf9e95ef618;p=emacs.git

merge from trunk
---

3c9c017cab31011b22218785d48b2bf9e95ef618