From: Rudolf Polzer <divVerent@alientrap.org>
Date: Mon, 27 Sep 2010 07:58:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/netradiant
X-Git-Tag: xonotic-v0.5.0~211
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1773a1823c77d3127d92151de0da290d362542b2;p=xonotic%2Fnetradiant.git

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

1773a1823c77d3127d92151de0da290d362542b2