From: FruitieX <fruitiex@gmail.com>
Date: Sun, 14 Nov 2010 18:28:00 +0000 (+0200)
Subject: Merge branch 'master' into fruitiex/dryfirefix
X-Git-Tag: xonotic-v0.1.0preview~139^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5764a546c4ad8680e37f49ea1f53943f2cf0d187;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into fruitiex/dryfirefix
---

5764a546c4ad8680e37f49ea1f53943f2cf0d187