From: ItsMe <itsme.xonotic@ymail.com>
Date: Sat, 9 Apr 2011 09:58:40 +0000 (+0200)
Subject: Merge branch 'master' into itsme/vorix
X-Git-Tag: xonotic-v0.8.0~14^2~11^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e6be0e1fef56f67dcfb8196f77c5b4a351182989;p=xonotic%2Fxonotic-maps.pk3dir.git

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

e6be0e1fef56f67dcfb8196f77c5b4a351182989