From: Joakim Verona <joakim@verona.se>
Date: Fri, 14 Jun 2013 21:54:26 +0000 (+0200)
Subject: Merge branch 'trunk' into xwidget
X-Git-Tag: emacs-25.0.90~2900^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a342ba649407875a265b8d56c9f7c3d87c4b43c;p=emacs.git

Merge branch 'trunk' into xwidget
---

2a342ba649407875a265b8d56c9f7c3d87c4b43c