From: Mario <mario.mario@y7mail.com>
Date: Sun, 16 Jun 2013 02:22:37 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~186
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bacce979f427e4d69fa7341ceb6ecf390cdecabb;p=xonotic%2Fxonotic-data.pk3dir.git

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

bacce979f427e4d69fa7341ceb6ecf390cdecabb