]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Dec 2013 20:32:55 +0000 (21:32 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Dec 2013 20:32:55 +0000 (21:32 +0100)

Trivial merge