]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 22 Dec 2013 20:14:21 +0000 (21:14 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 22 Dec 2013 20:14:21 +0000 (21:14 +0100)

Trivial merge