]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 12 Mar 2013 13:05:47 +0000 (14:05 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 12 Mar 2013 13:05:47 +0000 (14:05 +0100)

Trivial merge