From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 15 Nov 2010 06:36:48 +0000 (+0100)
Subject: Merge remote branch 'origin/samual/samualbalance'
X-Git-Tag: xonotic-v0.1.0preview~137
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e6b3fbaf2c068d8171250a4d82003ac6fcc21db;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/samualbalance'
---

3e6b3fbaf2c068d8171250a4d82003ac6fcc21db