From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 31 Dec 2010 17:55:14 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.xonotic.org/netradiant
X-Git-Tag: xonotic-v0.5.0~74
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c4a7877baf8d1fca0145028a7d5b342d74f1725b;p=xonotic%2Fnetradiant.git

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

c4a7877baf8d1fca0145028a7d5b342d74f1725b