From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 2 Dec 2010 12:41:27 +0000 (+0100)
Subject: Merge remote branch 'origin/cbrutail/nexballcreditfix'
X-Git-Tag: xonotic-v0.1.0preview~17
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=810e1c87badd1353a1271b595852954464cf2e67;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/cbrutail/nexballcreditfix'
---

810e1c87badd1353a1271b595852954464cf2e67