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

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

dbf4ed6939f70e795228a1dc7eee5c37da3da8ee