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

merge from trunk
---

4db1f22b64c3d19c963b67d9299dc508c440c625