]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 8 Jan 2012 12:30:41 +0000 (12:30 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 8 Jan 2012 12:30:41 +0000 (12:30 +0000)

Trivial merge