From: Mario <mario.mario@y7mail.com>
Date: Tue, 22 Oct 2013 13:46:04 +0000 (+1100)
Subject: Merge branch 'master' into Mario/respawn_delays
X-Git-Tag: xonotic-v0.8.0~258^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1532af143411264782fd7646d151df486e2b16aa;p=xonotic%2Fxonotic-data.pk3dir.git

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

1532af143411264782fd7646d151df486e2b16aa