]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'userguide-reset'
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 21:20:39 +0000 (22:20 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 21:20:39 +0000 (22:20 +0100)

Trivial merge