From: Mario <mario.mario@y7mail.com>
Date: Sun, 4 Aug 2013 09:34:23 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~177
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75ffb8c748ea73eda67375e366877cb2b40769d7;p=xonotic%2Fxonotic-data.pk3dir.git

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

75ffb8c748ea73eda67375e366877cb2b40769d7