]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'tests-i3lib-launch'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 00:14:00 +0000 (02:14 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 00:14:00 +0000 (02:14 +0200)

Trivial merge