]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 16 Mar 2013 23:59:52 +0000 (00:59 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 16 Mar 2013 23:59:52 +0000 (00:59 +0100)

Trivial merge