]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 23 Aug 2011 19:32:56 +0000 (21:32 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 23 Aug 2011 19:32:56 +0000 (21:32 +0200)

Trivial merge