From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 28 Apr 2010 14:34:02 +0000 (+0200)
Subject: Merge remote branch 'origin/divVerent/bastet'
X-Git-Tag: xonotic-v0.1.0preview~612^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b346a7a227555e4c9a3f192486948d88282cacc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/divVerent/bastet'
---

1b346a7a227555e4c9a3f192486948d88282cacc