From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 20:01:31 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2810
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e6a3959ba772997f80108b53317e966f63cf52d;p=emacs.git

merge from trunk
---

8e6a3959ba772997f80108b53317e966f63cf52d