]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 26 Nov 2011 22:18:01 +0000 (22:18 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 26 Nov 2011 22:18:01 +0000 (22:18 +0000)

Trivial merge