From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 16 Jul 2010 21:43:11 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
X-Git-Tag: xonotic-v0.1.0preview~454
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9a92ac66e5fd03335a0150e763c3def4b558c8b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
---

d9a92ac66e5fd03335a0150e763c3def4b558c8b