]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-floatdock'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 13:47:31 +0000 (15:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 13:47:31 +0000 (15:47 +0200)

Trivial merge