From: Joakim Verona <joakim@verona.se>
Date: Sat, 31 Jan 2015 23:37:46 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: emacs-25.0.90~2572
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69815dfe3704f8a8c733843f1fd04546cbb0f4d0;p=emacs.git

Merge branch 'master' into xwidget
---

69815dfe3704f8a8c733843f1fd04546cbb0f4d0