From: Rudolf Polzer Date: Sat, 18 Sep 2010 10:40:56 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/mirceakitsune/forced_campaign_team' X-Git-Tag: xonotic-v0.1.0preview~311^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b20d0a6bce1336436993a1adfa7a08d477be134a;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/mirceakitsune/forced_campaign_team' --- b20d0a6bce1336436993a1adfa7a08d477be134a