From: jave <joakim@verona.se>
Date: Mon, 5 Jan 2015 13:12:26 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: emacs-25.0.90~2608
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a0d5b71d55c73573c331e1e1a1dde9f206966e1;p=emacs.git

Merge branch 'master' into xwidget
---

5a0d5b71d55c73573c331e1e1a1dde9f206966e1