From: Mario <mario.mario@y7mail.com>
Date: Wed, 15 May 2013 04:37:18 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~19^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34f3c79ee027a1812e2f926a4ae352e75de2de9f;p=xonotic%2Fxonotic-maps.pk3dir.git

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

34f3c79ee027a1812e2f926a4ae352e75de2de9f