From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 27 Aug 2011 14:47:49 +0000 (+0200)
Subject: Merge branch 'colors-userguide'
X-Git-Tag: 4.0.2~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=808491a0200b22e973ddd0095633be1dbe75093e;p=i3%2Fi3

Merge branch 'colors-userguide'
---

808491a0200b22e973ddd0095633be1dbe75093e