From: Joakim Verona <joakim@verona.se>
Date: Tue, 20 Jan 2015 23:26:56 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: emacs-25.0.90~2592
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8628a48fec7fcd8bdbbf6ce5808fc574631d1541;p=emacs.git

Merge branch 'master' into xwidget
---

8628a48fec7fcd8bdbbf6ce5808fc574631d1541