From: Mario <mario.mario@y7mail.com>
Date: Mon, 7 Jan 2013 17:05:22 +0000 (+1100)
Subject: Merge branch 'master' into Mario/mutator_minstagib
X-Git-Tag: xonotic-v0.7.0~55^2~3^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=278f5440b4272f696c6b6e5bb9bb3139b8b53a11;p=xonotic%2Fxonotic-data.pk3dir.git

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

278f5440b4272f696c6b6e5bb9bb3139b8b53a11