From: Joakim Verona <joakim@verona.se>
Date: Sat, 14 Mar 2015 17:11:01 +0000 (+0100)
Subject: Merge branch 'master' into xwidget_mvp
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=816997258fa43ff4a6f4858d5128d6d772a0883b;p=emacs.git

Merge branch 'master' into xwidget_mvp
---

816997258fa43ff4a6f4858d5128d6d772a0883b