From: tzork <jakob_mg@hotmail.com>
Date: Tue, 1 Feb 2011 04:01:53 +0000 (+0100)
Subject: Merge remote branch 'origin/diabolik/more-lavacolors'
X-Git-Tag: xonotic-v0.5.0~114
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f08c9253e1940f7cd6b4b4954f3fc773cf42dc9c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/diabolik/more-lavacolors'
---

f08c9253e1940f7cd6b4b4954f3fc773cf42dc9c