]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'tree' into next
authorAxel Wagner <mail@merovius.de>
Sun, 31 Jul 2011 13:54:59 +0000 (15:54 +0200)
committerAxel Wagner <mail@merovius.de>
Sun, 31 Jul 2011 13:54:59 +0000 (15:54 +0200)

Trivial merge