From: mand1nga <mand1nga@xonotic.org>
Date: Sat, 9 Apr 2011 00:38:02 +0000 (-0300)
Subject: Merge remote branch 'origin/tzork/fl_notarget_ctflags'
X-Git-Tag: xonotic-v0.5.0~307^2~4^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=70ca128edf3e7a3e6614e9e9b054c9eea4748926;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/tzork/fl_notarget_ctflags'
---

70ca128edf3e7a3e6614e9e9b054c9eea4748926