]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 11 Jul 2014 07:51:28 +0000 (09:51 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 11 Jul 2014 07:51:28 +0000 (09:51 +0200)

Trivial merge