From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 05:21:04 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2778
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=86adbaf5408b79d5147bb91bfe0b907f505a0541;p=emacs.git

merge from trunk
---

86adbaf5408b79d5147bb91bfe0b907f505a0541