]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 7 Feb 2012 22:41:36 +0000 (17:41 -0500)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 7 Feb 2012 22:41:36 +0000 (17:41 -0500)
1  2 
testcases/t/167-workspace_layout.t

Simple merge