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