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

Trivial merge