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

Trivial merge