From: terencehill <piuntn@gmail.com>
Date: Fri, 13 Aug 2010 14:56:04 +0000 (+0200)
Subject: Merge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600' into terencehill/misc_bugfixes
X-Git-Tag: xonotic-v0.1.0preview~341^2~9
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=0c6fc307c63947463f12d20b1774b714b54d846f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600' into terencehill/misc_bugfixes

Conflicts:
	qcsrc/common/util.qc

I didn't merge directly master as I get this error:
too many files (created: 234 deleted: 1239), skipping inexact rename detection
I _HOPE_ the next merge won't fail...
---

0c6fc307c63947463f12d20b1774b714b54d846f