]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 31 Jul 2011 20:01:01 +0000 (22:01 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 31 Jul 2011 20:01:01 +0000 (22:01 +0200)

Trivial merge