From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 25 Jul 2011 05:38:02 +0000 (+0200)
Subject: Merge branch 'divVerent/courtfun2'
X-Git-Tag: xonotic-v0.5.0~92
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d78f1be9d7b0db16bf1d7960874ff4ffbb6ff33;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'divVerent/courtfun2'
---

1d78f1be9d7b0db16bf1d7960874ff4ffbb6ff33