]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-warping'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 10:14:03 +0000 (12:14 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 10:14:03 +0000 (12:14 +0200)

Trivial merge