From: FruitieX <rasse@rasse-laptop.(none)>
Date: Tue, 12 Oct 2010 17:12:07 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/gakarmor
X-Git-Tag: xonotic-v0.1.0preview~307^2~25^2~1^2^2
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=646837a15ec6b925c05d4740722d48e098ef2492

Merge remote branch 'origin/master' into fruitiex/gakarmor
---

646837a15ec6b925c05d4740722d48e098ef2492