]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 Jan 2013 17:11:17 +0000 (18:11 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 Jan 2013 17:11:17 +0000 (18:11 +0100)

Trivial merge