]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'testsuite' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 24 Sep 2011 19:10:21 +0000 (20:10 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 24 Sep 2011 19:10:21 +0000 (20:10 +0100)

Trivial merge