From: ItsMe <capbots@live.de>
Date: Sat, 12 Mar 2011 13:19:57 +0000 (+0100)
Subject: Merge branches 'master' and 'itsme/vorix' into itsme/vorix
X-Git-Tag: xonotic-v0.8.0~14^2~11^2~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e079ad6658e3d2a51f6dccf9850e823f4cfb0683;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branches 'master' and 'itsme/vorix' into itsme/vorix
---

e079ad6658e3d2a51f6dccf9850e823f4cfb0683