]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 17 Dec 2012 09:24:46 +0000 (10:24 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 17 Dec 2012 09:24:46 +0000 (10:24 +0100)

Trivial merge