From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 03:25:31 +0000 (+1100)
Subject: Merge branch 'nyov/instagib-rename'
X-Git-Tag: xonotic-v0.8.0~136
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6de28b8f7cc072475da92808b0a2223c112d291;p=xonotic%2Fxonotic-data.pk3dir.git

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

f6de28b8f7cc072475da92808b0a2223c112d291