From: Mario <mario.mario@y7mail.com>
Date: Tue, 1 Oct 2013 16:16:30 +0000 (-0700)
Subject: Merge branch 'master' into Mario/spawnsystem_mutator
X-Git-Tag: xonotic-v0.8.0~70^2~27^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dceed453457c89b7eb5d9564c2874ad3b58f464c;p=xonotic%2Fxonotic-data.pk3dir.git

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

dceed453457c89b7eb5d9564c2874ad3b58f464c