From: Grégoire Jadi <gregoire.jadi@gmail.com>
Date: Sat, 15 Jun 2013 09:24:47 +0000 (+0200)
Subject: Merge branch 'jave-xwidget' into xwidget
X-Git-Tag: emacs-25.0.90~2900
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a0f9e5e80586e4f2157fdfecae250c5619edf15;p=emacs.git

Merge branch 'jave-xwidget' into xwidget
---

1a0f9e5e80586e4f2157fdfecae250c5619edf15