From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 29 Nov 2010 21:33:37 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/cuinnton_credits'
X-Git-Tag: xonotic-v0.1.0preview~93
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5c13b3af01e247f840b7b3cf85d0e0d217eae4af;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/cuinnton_credits'
---

5c13b3af01e247f840b7b3cf85d0e0d217eae4af