From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Jan 2015 23:54:09 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: emacs-25.0.90~2595
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fee879f0a00bbe3f3389509874ee30a9cbc24cd4;p=emacs.git

Merge branch 'master' into xwidget
---

fee879f0a00bbe3f3389509874ee30a9cbc24cd4