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

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

14d7329d2f9d4186132e29815d0d55ff22d60e1e