From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 21 Jul 2010 18:01:03 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
X-Git-Tag: xonotic-v0.1.0preview~344
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=c6ea9d406d8541b88593ed69b46749d8ce350731

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

c6ea9d406d8541b88593ed69b46749d8ce350731