From: Andre Noll <maan@systemlinux.org>
Date: Sat, 29 Jan 2011 10:34:18 +0000 (+0100)
Subject: Merge branch 't/color_cleanups'
X-Git-Tag: v0.4.6~48
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=b62e2796b85c7d7f3138fe729f4637853e0fafe0;p=paraslash.git

Merge branch 't/color_cleanups'
---

b62e2796b85c7d7f3138fe729f4637853e0fafe0