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

Trivial merge