From: Mario <mario.mario@y7mail.com>
Date: Sat, 26 Jan 2013 03:35:58 +0000 (+1100)
Subject: Merge branch 'master' into mario/mutator_minstagib
X-Git-Tag: xonotic-v0.7.0~55^2~3^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d75cc459c25d507dc336bdf46b3a257505567a2;p=xonotic%2Fxonotic-data.pk3dir.git

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

8d75cc459c25d507dc336bdf46b3a257505567a2