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

Merge branch 'master' into xwidget
---

d522fd8ca73e668bfafd0419bc5f71f2751cca24