From: Mario <mario.mario@y7mail.com>
Date: Tue, 28 Jan 2014 05:45:43 +0000 (+1100)
Subject: Merge branch 'master' into Mario/nade_drop
X-Git-Tag: xonotic-v0.8.0~226^2~3^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02c69da4fd008a0291ebdd8b88129f86b3108e74;p=xonotic%2Fxonotic-data.pk3dir.git

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

02c69da4fd008a0291ebdd8b88129f86b3108e74