]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 16:15:10 +0000 (18:15 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 16:15:10 +0000 (18:15 +0200)

Trivial merge