From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 14 Nov 2010 16:46:59 +0000 (+0100)
Subject: Merge remote branch 'origin/samual/samualbalance'
X-Git-Tag: xonotic-v0.1.0preview~142
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=535736b42466b8d3c0922beac08debcd53d0590e;p=xonotic%2Fxonotic-data.pk3dir.git

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

535736b42466b8d3c0922beac08debcd53d0590e