From: Joakim Verona <joakim@verona.se>
Date: Tue, 27 Aug 2013 07:12:22 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2709
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=369c41754f0090065eb226e879f5c30a2a711132;p=emacs.git

merge from trunk
---

369c41754f0090065eb226e879f5c30a2a711132