]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 15 Feb 2012 22:05:28 +0000 (22:05 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 15 Feb 2012 22:05:28 +0000 (22:05 +0000)

Trivial merge