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

merge from trunk
---

93797975c60e1f1503f998be728ccbdbe1e86ab3