From: jave <joakim@verona.se>
Date: Sun, 4 Jan 2015 08:09:36 +0000 (+0100)
Subject: merge master
X-Git-Tag: emacs-25.0.90~2611
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a7e2c92ddf6c27b2cfcc9782fd71f15d36162cce;p=emacs.git

merge master
---

a7e2c92ddf6c27b2cfcc9782fd71f15d36162cce