From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 29 Aug 2011 07:38:25 +0000 (+0200)
Subject: Merge remote branch 'origin/samual/update_credits'
X-Git-Tag: xonotic-v0.5.0~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f4b429d47c4021ca6fce4e3fbe7760184fe92c0c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/update_credits'
---

f4b429d47c4021ca6fce4e3fbe7760184fe92c0c