]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 20:21:42 +0000 (22:21 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 20:21:42 +0000 (22:21 +0200)

Trivial merge