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

Merge branch 'cairo'.

Main work done by YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>.
Small fixes and image work by Jan D. <jan.h.d@swipnet.se>.
---

c03c730481bd2dc7bc857d9b4f1c41eea9bd495e