From: ItsMe <itsme.xonotic@ymail.com>
Date: Tue, 21 Jun 2011 23:06:06 +0000 (+0200)
Subject: Merge branch 'master' into itsme/vorix
X-Git-Tag: xonotic-v0.8.0~14^2~11^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=782794f10842c9d5eb029971de2966fb82c10fd8;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into itsme/vorix
---

782794f10842c9d5eb029971de2966fb82c10fd8