From: Joakim Verona <joakim@verona.se>
Date: Fri, 22 May 2015 14:47:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into xwidget_mvp
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4656572a1779c0516e9048f1a88434ce5b72536;p=emacs.git

Merge remote-tracking branch 'origin/master' into xwidget_mvp
---

b4656572a1779c0516e9048f1a88434ce5b72536