]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'tree' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 31 Jul 2011 19:56:02 +0000 (21:56 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 31 Jul 2011 19:56:02 +0000 (21:56 +0200)

Trivial merge