]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 20 Jan 2012 18:14:34 +0000 (18:14 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 20 Jan 2012 18:14:34 +0000 (18:14 +0000)

Trivial merge