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

Trivial merge