From: Mario <zacjardine@y7mail.com>
Date: Sat, 13 Dec 2014 01:06:13 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/Mirio/credits'
X-Git-Tag: xonotic-v0.8.0~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=39e1ef302d49b61777ce06f27b87d33bdf003fbd;p=xonotic%2Fxonotic-maps.pk3dir.git

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

39e1ef302d49b61777ce06f27b87d33bdf003fbd