From: jave <joakim@verona.se>
Date: Wed, 31 Dec 2014 11:24:10 +0000 (+0100)
Subject: merge upstream
X-Git-Tag: emacs-25.0.90~2631
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=baba9e039136e183e055169ddd7ca1e983fc734f;p=emacs.git

merge upstream
---

baba9e039136e183e055169ddd7ca1e983fc734f