]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'userguide-mark'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 11:57:25 +0000 (12:57 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 11:57:25 +0000 (12:57 +0100)

Trivial merge