]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next' into master
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 29 Mar 2015 17:07:24 +0000 (19:07 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 29 Mar 2015 17:07:24 +0000 (19:07 +0200)

Trivial merge