From: Joakim Verona <joakim@verona.se>
Date: Tue, 27 Jan 2015 19:38:56 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: emacs-25.0.90~2576
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a9de013720d8505369b42c7c110116ec822281f;p=emacs.git

Merge branch 'master' into xwidget
---

2a9de013720d8505369b42c7c110116ec822281f