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

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

e6f6513fc9a1beae5a48de93fb23372eada7dd85