Merge branch 'master' into mand1nga/bot-navigation-fixes
authormand1nga <mand1nga@xonotic.org>
Sat, 18 Dec 2010 22:17:54 +0000 (19:17 -0300)
committermand1nga <mand1nga@xonotic.org>
Sat, 18 Dec 2010 22:17:54 +0000 (19:17 -0300)

Trivial merge