From: Mario <mario.mario@y7mail.com>
Date: Fri, 19 Apr 2013 04:33:03 +0000 (+1000)
Subject: Merge branch 'master' into Mario/mutator_minstagib
X-Git-Tag: xonotic-v0.7.0~55^2~3^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97b8edd1e04d23094bc3735865d6caeae2d56738;p=xonotic%2Fxonotic-data.pk3dir.git

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

97b8edd1e04d23094bc3735865d6caeae2d56738