Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Sun, 21 Nov 2010 20:11:13 +0000 (15:11 -0500)
committerunknown <samual@xonotic.org>
Sun, 21 Nov 2010 20:11:13 +0000 (15:11 -0500)

Trivial merge