]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Sep 2011 23:40:42 +0000 (00:40 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Sep 2011 23:40:42 +0000 (00:40 +0100)

Trivial merge