From: Rudolf Polzer Date: Fri, 4 Jun 2010 18:20:59 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/fruitiex/nerfstrafing' X-Git-Tag: xonotic-v0.1.0preview~553^2~2^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e3c88249cc7308a1e525544fd59b53016a7a976;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/fruitiex/nerfstrafing' --- 2e3c88249cc7308a1e525544fd59b53016a7a976