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

merge from trunk
---

22fee396d08f331f962d793203a5cbf1cb003836