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

Trivial merge