From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 27 Nov 2010 12:38:57 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/balance'
X-Git-Tag: xonotic-v0.1.0preview~99
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18976c01ddd9b119e2fb37eea11f97958400eb63;p=xonotic%2Fxonotic-data.pk3dir.git

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

18976c01ddd9b119e2fb37eea11f97958400eb63