From: Mirio <opivy@hotmail.de>
Date: Wed, 26 Oct 2016 00:40:36 +0000 (+0000)
Subject: Merge branch 'Mirio/nanite' into 'master'
X-Git-Tag: xonotic-v0.8.2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae64501898e864a215380f855928e7c914b2af33;p=xonotic%2Fxonotic-music.pk3dir.git

Merge branch 'Mirio/nanite' into 'master'

Add soundtrack contest winner Nanite

See merge request !2
---

ae64501898e864a215380f855928e7c914b2af33