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

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

d1d799c4320d9ea36e9657fdaa9f980e22750fa8