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)
commitf010bbd9fd6abf2fb205f6ac8112722265584f5e
tree7edcc654872a200960ee48f936b0873e334cd3e4
parentfb0b9ad0a060e2f27d21bd76006c822dcdae8043
parent89dcda179d36bdc9b3bdc824e1798b230610892b
Merge branch 'master' into mand1nga/bot-navigation-fixes