From: Mario <mario.mario@y7mail.com>
Date: Mon, 6 May 2013 21:44:53 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~249
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=40eb151be5ea5fca60d5919c7053848a2c7ba248;p=xonotic%2Fxonotic-data.pk3dir.git

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

40eb151be5ea5fca60d5919c7053848a2c7ba248