From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 15 Aug 2010 06:47:26 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~352^2
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=57fc749c7a6549d2d3e6ff79779ecb7400767410;hp=-c

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

57fc749c7a6549d2d3e6ff79779ecb7400767410