Merge branch 'mand1nga/rebrand' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authormand1nga <saulo_gil@argentina.com>
Sun, 6 Jun 2010 02:13:18 +0000 (23:13 -0300)
committermand1nga <saulo_gil@argentina.com>
Sun, 6 Jun 2010 02:13:18 +0000 (23:13 -0300)

Trivial merge