Merge remote-tracking branch 'origin/Mario/old_tutorial'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 26 Nov 2014 10:45:18 +0000 (11:45 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 26 Nov 2014 10:45:18 +0000 (11:45 +0100)

Trivial merge