]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 11:47:57 +0000 (13:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 11:47:57 +0000 (13:47 +0200)

Trivial merge