From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 23 Feb 2011 13:19:58 +0000 (+0100)
Subject: Merge branch 'master' of ssh://icculus.org/netradiant
X-Git-Tag: xonotic-v0.5.0~43
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=806e3fe1c8297febd69d0d59a2b91d929ba521fe

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

806e3fe1c8297febd69d0d59a2b91d929ba521fe