From: jave <joakim@verona.se>
Date: Sun, 28 Dec 2014 16:33:38 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: emacs-25.0.90~2634
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=703cbed72f82633cf3720ce8ad0523ea3af2c9f5;p=emacs.git

Merge branch 'master' into xwidget
---

703cbed72f82633cf3720ce8ad0523ea3af2c9f5