From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 1 Dec 2010 20:14:41 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/balance'
X-Git-Tag: xonotic-v0.1.0preview~79
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e1ee96d23a1e8a4ca34125b8b3ed31755d315357;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/balance'
---

e1ee96d23a1e8a4ca34125b8b3ed31755d315357