From: Samual <samual@xonotic.org>
Date: Mon, 21 Mar 2011 23:24:49 +0000 (-0400)
Subject: Merge branch 'samual/crylink_updates' into samual/change_default_balance
X-Git-Tag: xonotic-v0.5.0~305^2~17^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf744bb63500361b13d78262c4a5ec526fee37bb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'samual/crylink_updates' into samual/change_default_balance
---

cf744bb63500361b13d78262c4a5ec526fee37bb