From: Mario <mario.mario@y7mail.com>
Date: Thu, 27 Nov 2014 05:38:22 +0000 (+1100)
Subject: Merge branch 'nyov/instagib-rename'
X-Git-Tag: xonotic-v0.8.0~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c35a168b4be94910d55750acd70787da0780377c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'nyov/instagib-rename'
---

c35a168b4be94910d55750acd70787da0780377c