From: mand1nga <saulo_gil@argentina.com>
Date: Sun, 6 Jun 2010 02:13:18 +0000 (-0300)
Subject: Merge branch 'mand1nga/rebrand' of ssh://git.xonotic.org/xonotic-data.pk3dir into... 
X-Git-Tag: xonotic-v0.1.0preview~547^2~1^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=715202f719f244160bfc0b004013fa6e1bcc5668;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'mand1nga/rebrand' of ssh://git.xonotic.org/xonotic-data.pk3dir into mand1nga/rebrand
---

715202f719f244160bfc0b004013fa6e1bcc5668