From: Mario <mario.mario@y7mail.com>
Date: Fri, 12 Jul 2013 00:04:10 +0000 (+1000)
Subject: Merge branch 'master' into Mario/mutators
X-Git-Tag: xonotic-v0.8.0~366^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a00d7aad132a38ac48dc4a1cd0c49aa829a0b850;p=xonotic%2Fxonotic-data.pk3dir.git

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

a00d7aad132a38ac48dc4a1cd0c49aa829a0b850