From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 25 Aug 2012 12:04:23 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/world_cubemaps
X-Git-Tag: xonotic-v0.8.0~5^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=160ddb2c2a2ffe956770cb7d4128e9424d3b7cc2;p=xonotic%2Fxonotic-maps.pk3dir.git

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

160ddb2c2a2ffe956770cb7d4128e9424d3b7cc2