]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 28 May 2012 21:37:26 +0000 (23:37 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 28 May 2012 21:37:26 +0000 (23:37 +0200)

Trivial merge