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

Trivial merge