]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 8 Sep 2015 07:19:33 +0000 (09:19 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 8 Sep 2015 07:19:33 +0000 (09:19 +0200)

Trivial merge