]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 9 Aug 2011 07:47:10 +0000 (09:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 9 Aug 2011 07:47:10 +0000 (09:47 +0200)

Trivial merge