]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 12 Aug 2011 21:11:13 +0000 (23:11 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 12 Aug 2011 21:11:13 +0000 (23:11 +0200)

Trivial merge