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

merge from trunk
---

a24dabe5ac4e7d051b9c1d6fc3bc17154ea0d042