From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 11 Aug 2011 20:22:36 +0000 (+0200)
Subject: Merge branch 'warp-pointer'
X-Git-Tag: 4.0.2~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=79479617c7c2f03f05f1d389515d6267cb55a1bb;p=i3%2Fi3

Merge branch 'warp-pointer'
---

79479617c7c2f03f05f1d389515d6267cb55a1bb