From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 9 Feb 2011 12:33:08 +0000 (+0100)
Subject: Merge remote branch 'origin/terencehill/misc_bugfixes'
X-Git-Tag: xonotic-v0.5.0~311^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c5cac294cfb0249c19985066b31e21f7ffa9a61;p=xonotic%2Fxonotic-data.pk3dir.git

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

8c5cac294cfb0249c19985066b31e21f7ffa9a61