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

Trivial merge