From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 04:06:25 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2661
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f6e32297ee0536354c3261027f6c65586c646f0;p=emacs.git

merge from trunk
---

4f6e32297ee0536354c3261027f6c65586c646f0