]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 30 May 2012 15:27:22 +0000 (17:27 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 30 May 2012 15:27:22 +0000 (17:27 +0200)

Trivial merge