From: Joakim Verona <joakim@verona.se>
Date: Sun, 8 Feb 2015 20:55:28 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fxwidget;p=emacs.git

merge master
---

5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529