From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 14 Oct 2010 08:07:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://icculus.org/netradiant
X-Git-Tag: xonotic-v0.5.0~170
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc6bdd4869b80171d5690094f46254ecc2a2e860;p=xonotic%2Fnetradiant.git

Merge branch 'master' of ssh://icculus.org/netradiant
---

cc6bdd4869b80171d5690094f46254ecc2a2e860