]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 24 Jun 2012 19:22:44 +0000 (21:22 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 24 Jun 2012 19:22:44 +0000 (21:22 +0200)

Trivial merge