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

Trivial merge