]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'userguide-resize'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 27 Jan 2013 19:20:53 +0000 (20:20 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 27 Jan 2013 19:20:53 +0000 (20:20 +0100)

Trivial merge