Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Thu, 25 Nov 2010 07:18:22 +0000 (02:18 -0500)
committerunknown <samual@xonotic.org>
Thu, 25 Nov 2010 07:18:22 +0000 (02:18 -0500)

Trivial merge