From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 3 May 2011 18:51:15 +0000 (+0200)
Subject: Merge remote branch 'origin/tzork/credits-update'
X-Git-Tag: xonotic-v0.5.0~20^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7926d6c59c1401f4c7aec78c428f9b3766e133a7;p=xonotic%2Fxonotic-data.pk3dir.git

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

7926d6c59c1401f4c7aec78c428f9b3766e133a7