From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sat, 19 Mar 2011 07:46:31 +0000 (+0100)
Subject: Merge remote branch 'origin/terencehill/misc_bugfixes'
X-Git-Tag: xonotic-v0.5.0~305^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=917095a50742b4d2469a9ab8d814dcbb10d10c20;p=xonotic%2Fxonotic-data.pk3dir.git

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

917095a50742b4d2469a9ab8d814dcbb10d10c20