From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 8 Jun 2011 16:02:09 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/lab610
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6f1e8b90b384375f5dfac638f6b2a43f1dd76925;p=xonotic%2Fxonotic-maps.pk3dir.git

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

6f1e8b90b384375f5dfac638f6b2a43f1dd76925