From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 4 Apr 2012 21:36:03 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/world_cubemaps
X-Git-Tag: xonotic-v0.8.0~5^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b090ebf14d4645fec0a8f8bfafc94c9764a62a19;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into mirceakitsune/world_cubemaps
---

b090ebf14d4645fec0a8f8bfafc94c9764a62a19