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

Merge branch 'colors-userguide' into next
---

61cbf7a65896406a15065a85579fc6ed63a33b5f