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

Trivial merge