]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Dec 2012 20:13:12 +0000 (21:13 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Dec 2012 20:13:12 +0000 (21:13 +0100)

Trivial merge