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

merge from trunk
---

a218d7fbf59ed0896f02bf50ed1702c26696cd30