From: Samual <samual@xonotic.org>
Date: Wed, 23 Mar 2011 01:36:13 +0000 (-0400)
Subject: Merge branch 'samual/change_default_balance' of ssh://git.xonotic.org/xonotic-data... 
X-Git-Tag: xonotic-v0.5.0~305^2~17^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=612efe644096248beb6e6a08809d9f74d31e81e4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'samual/change_default_balance' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/change_default_balance
---

612efe644096248beb6e6a08809d9f74d31e81e4