From: Jan D <jan.h.d@swipnet.se>
Date: Fri, 3 Apr 2015 12:02:13 +0000 (+0200)
Subject: Merge branch 'master' into cairo, fixes tooltips not shown.
X-Git-Tag: emacs-25.0.90~2008^2~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb77948660d9a1d21339bb9657e1227063911ddc;p=emacs.git

Merge branch 'master' into cairo, fixes tooltips not shown.
---

fb77948660d9a1d21339bb9657e1227063911ddc