]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 21 Nov 2011 19:56:03 +0000 (19:56 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 21 Nov 2011 19:56:03 +0000 (19:56 +0000)

Trivial merge