Merge remote branch 'origin/master' into samual/runningman_separate
authorSamual <samual@xonotic.org>
Tue, 24 Jan 2012 20:12:50 +0000 (15:12 -0500)
committerSamual <samual@xonotic.org>
Tue, 24 Jan 2012 20:12:50 +0000 (15:12 -0500)

Trivial merge