]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 28 Nov 2011 23:28:03 +0000 (23:28 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 28 Nov 2011 23:28:03 +0000 (23:28 +0000)

Trivial merge