]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 22 Dec 2012 13:08:14 +0000 (14:08 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 22 Dec 2012 13:08:14 +0000 (14:08 +0100)

Trivial merge