]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 18 May 2012 07:14:38 +0000 (09:14 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 18 May 2012 07:14:38 +0000 (09:14 +0200)

Trivial merge