From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 5 Jul 2010 06:07:14 +0000 (+0200)
Subject: Merge remote branch 'origin/terencehill/misc_bugfixes'
X-Git-Tag: xonotic-v0.1.0preview~465
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=18b4e35ab44763ec2ea70b5768df431a66ece215

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

18b4e35ab44763ec2ea70b5768df431a66ece215