From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 05:39:59 +0000 (+0000)
Subject: Merge branch 'nyov/instagib-rename' into 'master'
X-Git-Tag: xonotic-v0.8.0~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b9e6e89611ab38559aae7ad1436494a4d5c9bcb6;p=xonotic%2Fxonotic.git

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

instagib rename

See merge request !4
---

b9e6e89611ab38559aae7ad1436494a4d5c9bcb6