From: Mario <mario.mario@y7mail.com>
Date: Sat, 29 Nov 2014 13:17:18 +0000 (+1100)
Subject: Merge branch 'master' into itsme/vorix
X-Git-Tag: xonotic-v0.8.0~14^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97e57b7802c6f1de34d77ca87403946165672b29;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into itsme/vorix
---

97e57b7802c6f1de34d77ca87403946165672b29