From: Mario <mario.mario@y7mail.com>
Date: Wed, 5 Jun 2013 00:53:35 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~201
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=660451e2a1499aae45fdf8307244814f6cae79ae;p=xonotic%2Fxonotic-data.pk3dir.git

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

660451e2a1499aae45fdf8307244814f6cae79ae