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

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

c830adab7065491164abb531af83113109017301