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

merge from trunk
---

31800c9173af4d2c445bb52b2c338a3f0bde5b12