From: FruitieX <rasse@rasse-laptop.(none)>
Date: Tue, 12 Oct 2010 20:24:26 +0000 (+0300)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.1.0preview~307^2~25^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a36e2f5a19303584684bebb89e149e13da121668;p=xonotic%2Fxonotic-data.pk3dir.git

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

a36e2f5a19303584684bebb89e149e13da121668