]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next' into master
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Sep 2015 06:55:24 +0000 (08:55 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Sep 2015 06:55:24 +0000 (08:55 +0200)

Trivial merge