]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 18:44:18 +0000 (20:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 18:44:18 +0000 (20:44 +0200)

Trivial merge