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

Trivial merge