From: Joakim Verona <joakim@verona.se>
Date: Wed, 29 May 2013 07:57:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/trunk' into xwidget
X-Git-Tag: emacs-25.0.90~2907
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f0994366d33f8f76db4662cc126720866df3461;p=emacs.git

Merge remote-tracking branch 'origin/trunk' into xwidget
---

4f0994366d33f8f76db4662cc126720866df3461