From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 9 Dec 2010 19:59:11 +0000 (+0100)
Subject: Merge remote branch 'origin/diabolik/credits-update'
X-Git-Tag: xonotic-v0.1.0preview~66
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=997cb76a518f8a50c1cfa41e3f7b3d1489b38937;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/diabolik/credits-update'
---

997cb76a518f8a50c1cfa41e3f7b3d1489b38937