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

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

6ba4eb88c07ff16e378adf8faa9c46adccd4effc