]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 28 Feb 2015 14:02:31 +0000 (15:02 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 28 Feb 2015 14:02:31 +0000 (15:02 +0100)

Trivial merge