From: Mario <mario.mario@y7mail.com>
Date: Tue, 4 Jun 2013 00:10:43 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~202
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8b6542f46abb4c4ae2afde8d37eff347ab8a33e;p=xonotic%2Fxonotic-data.pk3dir.git

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

e8b6542f46abb4c4ae2afde8d37eff347ab8a33e