From: Joakim Verona <joakim@verona.se>
Date: Tue, 3 Feb 2015 00:07:36 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7541dfb4a942401901e9cdf1efc4847da51c692;p=emacs.git

Merge branch 'master' into xwidget

Conflicts:
	lisp/ChangeLog
---

b7541dfb4a942401901e9cdf1efc4847da51c692