]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 11 Nov 2011 22:49:20 +0000 (22:49 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 11 Nov 2011 22:49:20 +0000 (22:49 +0000)

Trivial merge