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

merge from trunk
---

e74a8c483a03385de9a767bc67ec411a43b615a7