]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'testsuite' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 4 Oct 2011 22:39:59 +0000 (23:39 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 4 Oct 2011 22:39:59 +0000 (23:39 +0100)

Trivial merge