From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 26 Nov 2014 10:45:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/Mario/old_tutorial'
X-Git-Tag: xonotic-v0.8.0~141
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae88698cf0e9dd015cc47879a6cd53de35cca248;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/old_tutorial'
---

ae88698cf0e9dd015cc47879a6cd53de35cca248