From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 12 Oct 2010 18:03:29 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/gakarmor'
X-Git-Tag: xonotic-v0.1.0preview~307^2~25^2~1^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c4cb17a6d750a957ade68c0ffddc269b643cb2a;p=xonotic%2Fxonotic-data.pk3dir.git

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

4c4cb17a6d750a957ade68c0ffddc269b643cb2a