From: Samual <samual@xonotic.org>
Date: Fri, 14 Oct 2011 19:03:33 +0000 (-0400)
Subject: Merge remote branch 'origin/terencehill/maximized_radar'
X-Git-Tag: xonotic-v0.6.0~40^2~41^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=58a2e777de55cd78555e6b4526b5e84e9430fec8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/maximized_radar'
---

58a2e777de55cd78555e6b4526b5e84e9430fec8