From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 16 Feb 2011 06:35:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/samual/balancesamual'
X-Git-Tag: xonotic-v0.5.0~311^2~12
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=de81714be5741ed044883535fb6589d8149c501e

Merge remote-tracking branch 'origin/samual/balancesamual'
---

de81714be5741ed044883535fb6589d8149c501e