]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 22 Aug 2011 10:44:58 +0000 (12:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 22 Aug 2011 10:44:58 +0000 (12:44 +0200)

Trivial merge