]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'workspace_on_output' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 8 Jan 2012 16:33:48 +0000 (16:33 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 8 Jan 2012 16:33:48 +0000 (16:33 +0000)

Trivial merge