From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 6 Jul 2011 08:21:41 +0000 (+0200)
Subject: Merge remote branch 'origin/divVerent/newchannels'
X-Git-Tag: xonotic-v0.5.0~151^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=588aa51e32e49279fce822b415e754460b0c45c1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/divVerent/newchannels'
---

588aa51e32e49279fce822b415e754460b0c45c1