]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 1 Aug 2011 21:18:53 +0000 (23:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 1 Aug 2011 21:18:53 +0000 (23:18 +0200)

Trivial merge