From: nyov <nyov@nexnode.net>
Date: Fri, 9 Mar 2012 06:38:44 +0000 (+0100)
Subject: Merge tag 'xonotic-v0.6.0' into nyov/dedicated-startupscreen
X-Git-Tag: xonotic-v0.7.0~356^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=687a42edc07762ab7b176c6d2af5d0f7cec97147;p=xonotic%2Fxonotic-data.pk3dir.git

Merge tag 'xonotic-v0.6.0' into nyov/dedicated-startupscreen

Xonotic Release 0.6.0
---

687a42edc07762ab7b176c6d2af5d0f7cec97147