From: Mario <mario.mario@y7mail.com>
Date: Wed, 14 Aug 2013 01:39:44 +0000 (+1000)
Subject: Merge branch 'master' into Mario/mutators
X-Git-Tag: xonotic-v0.8.0~366^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=8ece2525b0ef31c747f8e0913d6d7ce1307b147b

Merge branch 'master' into Mario/mutators
---

8ece2525b0ef31c747f8e0913d6d7ce1307b147b