From: Mario <mario.mario@y7mail.com>
Date: Wed, 16 Oct 2013 07:20:53 +0000 (+1100)
Subject: Merge branch 'master' into Mario/turrets
X-Git-Tag: xonotic-v0.8.2~2052^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=763a9ac7368a483a9babeabe151272b7a87b313e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/turrets
---

763a9ac7368a483a9babeabe151272b7a87b313e