]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'colors-userguide'
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 14:47:49 +0000 (16:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 14:47:49 +0000 (16:47 +0200)

Trivial merge