Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic-data.pk3dir
authormand1nga <saulo_gil@argentina.com>
Thu, 18 Mar 2010 20:33:12 +0000 (17:33 -0300)
committermand1nga <saulo_gil@argentina.com>
Thu, 18 Mar 2010 20:33:12 +0000 (17:33 -0300)

Trivial merge