]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 29 Nov 2011 20:50:11 +0000 (20:50 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 29 Nov 2011 20:50:11 +0000 (20:50 +0000)

Trivial merge