From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 17:16:52 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2815
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd2ec20a745d3c3436b5ca842e2c0b5bf8c7e26f;p=emacs.git

merge from trunk
---

dd2ec20a745d3c3436b5ca842e2c0b5bf8c7e26f