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

Merge branch 'master' into xwidget
---

d6ada5ae0fad7a5c85eb28b102bc460e9fe0aceb