From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 12 Nov 2010 06:57:24 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/fruitbalance'
X-Git-Tag: xonotic-v0.1.0preview~153^2~3
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=b49a2cd1f819e03ebb72db44594d2e336201d73e

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

b49a2cd1f819e03ebb72db44594d2e336201d73e