]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 01:33:36 +0000 (03:33 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 01:33:36 +0000 (03:33 +0200)

Trivial merge