From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 2 Nov 2010 14:00:52 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/lab610
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2493a2e972ef70604f762a5cbbec4929682fcf6;p=xonotic%2Fxonotic-maps.pk3dir.git

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

d2493a2e972ef70604f762a5cbbec4929682fcf6