]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'move-output' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 14:13:11 +0000 (16:13 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 14:13:11 +0000 (16:13 +0200)

Trivial merge