]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'ws_next' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 21:22:03 +0000 (22:22 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 21:22:03 +0000 (22:22 +0100)

Trivial merge