From: Joakim Verona <joakim@verona.se>
Date: Fri, 19 Jul 2013 23:44:36 +0000 (+0200)
Subject: Merge branch 'trunk' into xwidget
X-Git-Tag: emacs-25.0.90~2874
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=759dbb1aebe68fb392f7ed53eba4b460ae6b83be;p=emacs.git

Merge branch 'trunk' into xwidget
---

759dbb1aebe68fb392f7ed53eba4b460ae6b83be