]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 22 Sep 2011 22:11:14 +0000 (23:11 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 22 Sep 2011 22:11:14 +0000 (23:11 +0100)

Trivial merge