Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Wed, 2 Mar 2011 17:04:56 +0000 (12:04 -0500)
committerSamual <samual@xonotic.org>
Wed, 2 Mar 2011 17:04:56 +0000 (12:04 -0500)

Trivial merge