From: Mario <mario.mario@y7mail.com>
Date: Sat, 12 Oct 2013 05:43:26 +0000 (+1100)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~58
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b49873bcf5874782489e6fec264370078c7d6710;p=xonotic%2Fxonotic-data.pk3dir.git

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

b49873bcf5874782489e6fec264370078c7d6710