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

merge from trunk
---

207a6ffd668f371fb2deb948e21f28d39d698596