Merge remote branch 'origin/terencehill/crosshair_colors'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:41:56 +0000 (09:41 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:41:56 +0000 (09:41 +0100)

Trivial merge