From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 11:16:55 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2724
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4f7fcad493446e503f836ca936a878e54cc5f94;p=emacs.git

merge from trunk
---

b4f7fcad493446e503f836ca936a878e54cc5f94