]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 7 Aug 2013 19:13:46 +0000 (21:13 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 7 Aug 2013 19:13:46 +0000 (21:13 +0200)

Trivial merge