From: mand1nga <mand1nga@xonotic.org>
Date: Thu, 18 Aug 2011 20:05:30 +0000 (-0300)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.5.0~115
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=603f4e6f631266b04f17b6e19559936fd7b0f44a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
---

603f4e6f631266b04f17b6e19559936fd7b0f44a