From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 10 Nov 2011 22:48:04 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/lab610
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=898a94e6cbcae535782574109bf808b639ac099f;p=xonotic%2Fxonotic-maps.pk3dir.git

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

898a94e6cbcae535782574109bf808b639ac099f