From: Rudolf Polzer Date: Fri, 14 Jan 2011 20:18:10 +0000 (+0100) Subject: Merge remote branch 'origin/cbrutail/credits' X-Git-Tag: xonotic-v0.5.0~318^2~121 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=51e6f9043c05aca7501ee34b0717370c065f389d;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/cbrutail/credits' --- 51e6f9043c05aca7501ee34b0717370c065f389d