]> git.sur5r.net Git - i3/i3/commitdiff
Merge remote-tracking branch 'mxf/merge' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 8 Oct 2011 21:01:41 +0000 (22:01 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 8 Oct 2011 21:01:41 +0000 (22:01 +0100)

Trivial merge