From: Samual <samual@xonotic.org>
Date: Sun, 19 Feb 2012 22:58:46 +0000 (-0500)
Subject: Merge remote branch 'origin/samual/balance_testing'
X-Git-Tag: xonotic-v0.6.0~66^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a9fac2d73f7bc0e8fec39883304a9c9fbc3dcde;p=xonotic%2Fxonotic-data.pk3dir.git

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

7a9fac2d73f7bc0e8fec39883304a9c9fbc3dcde