]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next' into testcases
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 11 Aug 2009 10:40:11 +0000 (12:40 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 11 Aug 2009 10:40:11 +0000 (12:40 +0200)

Trivial merge