Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Sat, 20 Nov 2010 06:57:07 +0000 (01:57 -0500)
committerunknown <samual@xonotic.org>
Sat, 20 Nov 2010 06:57:07 +0000 (01:57 -0500)

Trivial merge