From: Mario <mario@smbclan.net>
Date: Tue, 19 Jul 2016 14:23:41 +0000 (+1000)
Subject: Merge branch 'Mario/flag_return_fixes'
X-Git-Tag: xonotic-v0.8.2~700^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1c2e6652de39756a945fa5eb8b2d4953ef50e2d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/flag_return_fixes'
---

b1c2e6652de39756a945fa5eb8b2d4953ef50e2d