From: Mario <zacjardine@y7mail.com>
Date: Sat, 26 Aug 2017 14:05:57 +0000 (+0000)
Subject: Merge branch 'martin-t/flag' into 'master'
X-Git-Tag: xonotic-v0.8.5~2507
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8121bbc66f59f5c03939e3ce60575fcbc30ef764;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/flag' into 'master'

Allow 3 flag throws in ctf

See merge request !470
---

8121bbc66f59f5c03939e3ce60575fcbc30ef764