From: Joakim Verona <joakim@verona.se>
Date: Fri, 15 Jan 2016 19:06:45 +0000 (+0100)
Subject: merge master
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fxwidget_mvp;p=emacs.git

merge master
---

4b73dac2885aa7eb23b66c299065e19bd118a4fb