From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 17 Aug 2011 10:14:03 +0000 (+0200)
Subject: Merge branch 'fix-warping'
X-Git-Tag: 4.0.2~41
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=336ce56cf36ee5ddc4358fac9bb7bedb92b659eb;p=i3%2Fi3

Merge branch 'fix-warping'
---

336ce56cf36ee5ddc4358fac9bb7bedb92b659eb