From: Rudolf Polzer <rpolzer@nb-04.(none)>
Date: Thu, 25 Mar 2010 14:27:34 +0000 (+0100)
Subject: Merge branch 'mirceakitsune/bugfixes'
X-Git-Tag: xonotic-v0.1.0preview~678
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d0b8b049c29ad3f0154063c91034268c4531ae05

Merge branch 'mirceakitsune/bugfixes'
---

d0b8b049c29ad3f0154063c91034268c4531ae05