From: Mario <zacjardine@y7mail.com>
Date: Thu, 11 Dec 2014 23:38:41 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/Mirio/credits'
X-Git-Tag: xonotic-v0.8.0~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ca9598bd85dac9bd2f84eb870b62e537e1594e7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/credits'
---

6ca9598bd85dac9bd2f84eb870b62e537e1594e7