]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 13:55:45 +0000 (13:55 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 13:55:45 +0000 (13:55 +0000)

Trivial merge