From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 21 Aug 2011 05:49:40 +0000 (-0300)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.5.0~106
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a85ba9a36cb84bdfa37b0934976ae7c2e5248454;p=xonotic%2Fxonotic-data.pk3dir.git

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

a85ba9a36cb84bdfa37b0934976ae7c2e5248454