From: Mario <mario.mario@y7mail.com>
Date: Fri, 26 Jul 2013 14:15:27 +0000 (+1000)
Subject: Merge branch 'master' into Mario/respawn_delays
X-Git-Tag: xonotic-v0.8.0~258^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2b777d3a3bf28bbf5c29202d84a80de257e4ae7e;p=xonotic%2Fxonotic-data.pk3dir.git

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

2b777d3a3bf28bbf5c29202d84a80de257e4ae7e