From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 24 Aug 2011 08:39:53 +0000 (+0200)
Subject: Merge remote branch 'origin/divVerent/nixnex-fixes'
X-Git-Tag: xonotic-v0.5.0~74
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95b5f18c2d64491e37232666efe97122f6aaf5b8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/divVerent/nixnex-fixes'
---

95b5f18c2d64491e37232666efe97122f6aaf5b8