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

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

f98617a36b6c2e4465c163e828e6e5967d00d951