]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'testsuite' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 5 Oct 2011 23:08:06 +0000 (00:08 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 5 Oct 2011 23:08:06 +0000 (00:08 +0100)

Trivial merge