From: Mario <zacjardine@y7mail.com>
Date: Mon, 5 Jan 2015 22:11:04 +0000 (+0000)
Subject: Merge branch 'Mirio/credits' into 'master'
X-Git-Tag: xonotic-v0.8.0~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c9ff5a702ecc45075c8c4671198e23d2c5ca8675;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mirio/credits' into 'master'

Mirio/credits

Updated credits

See merge request !80
---

c9ff5a702ecc45075c8c4671198e23d2c5ca8675