From: Jan D <jan.h.d@swipnet.se>
Date: Sat, 23 May 2015 10:28:54 +0000 (+0200)
Subject: Merge branch 'master' into cairo
X-Git-Tag: emacs-25.0.90~2008^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6aaa489dc112f51f6045f79b37cb78dd513e398f;p=emacs.git

Merge branch 'master' into cairo
---

6aaa489dc112f51f6045f79b37cb78dd513e398f