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

merge from trunk
---

d84cbc292773e6f3178b276c34f52b22220a2163