From: Mario <zacjardine@y7mail.com>
Date: Tue, 3 Feb 2015 05:31:40 +0000 (+0000)
Subject: Merge branch 'Mirio/credits' into 'master'
X-Git-Tag: xonotic-v0.8.1~128
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ea48961feb50159e05ef56f38b7fd0ebc15cc64e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mirio/credits' into 'master'

Mirio/credits

Somehow CuBe0wL got lost

See merge request !92
---

ea48961feb50159e05ef56f38b7fd0ebc15cc64e