From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 14 Jul 2010 18:16:22 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~423^2~65
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=4e6d5b02ec3b69aa98c30e5e4d2a0816dd1c8f15

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

4e6d5b02ec3b69aa98c30e5e4d2a0816dd1c8f15