From: Mario <mario.mario@y7mail.com>
Date: Wed, 4 Jun 2014 21:35:24 +0000 (+1000)
Subject: Merge branch 'master' into Mario/ons_updates
X-Git-Tag: xonotic-v0.8.2~2050^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f99b2cde35120861da80a023001d6f2cc2876030;p=xonotic%2Fxonotic-data.pk3dir.git

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

f99b2cde35120861da80a023001d6f2cc2876030