From: tzork <jakob_mg@hotmail.com>
Date: Sat, 5 Feb 2011 11:43:41 +0000 (+0100)
Subject: Merge remote branch 'origin/diabolik/stein1x'
X-Git-Tag: xonotic-v0.5.0~112
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb5ee898d7c5cab099fbe1407c7fcf3efa98fab1;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/diabolik/stein1x'
---

cb5ee898d7c5cab099fbe1407c7fcf3efa98fab1