From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 25 Sep 2010 08:20:28 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
X-Git-Tag: xonotic-v0.1.0preview~194
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=600285e93c924f3bfc482dee2c4990768c05cd79;p=xonotic%2Fxonotic.git

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

600285e93c924f3bfc482dee2c4990768c05cd79