Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Tue, 16 Nov 2010 02:47:40 +0000 (21:47 -0500)
committerunknown <samual@xonotic.org>
Tue, 16 Nov 2010 02:47:40 +0000 (21:47 -0500)

Trivial merge