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

Trivial merge