From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 21 Jul 2010 09:02:21 +0000 (+0300)
Subject: Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir... 
X-Git-Tag: xonotic-v0.1.0preview~423^2~26^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94c80fbc1f9fcf0314c5ac1f408fd2b365557471;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/fruitbalance
---

94c80fbc1f9fcf0314c5ac1f408fd2b365557471