From: jave <joakim@verona.se>
Date: Fri, 2 Jan 2015 15:30:55 +0000 (+0100)
Subject: merge master
X-Git-Tag: emacs-25.0.90~2612
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db4613576d3115aa320f0293d081ce98baa06acd;p=emacs.git

merge master
---

db4613576d3115aa320f0293d081ce98baa06acd