]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 13:39:33 +0000 (14:39 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 13:39:33 +0000 (14:39 +0100)

Trivial merge