From: jal <germangar@gmail.com>
Date: Fri, 28 May 2010 19:51:30 +0000 (+0200)
Subject: Merge branch 'master' of ssh://icculus.org/netradiant
X-Git-Tag: xonotic-v0.5.0~257^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a0d1500f7c1582dc7a6283201354588a78fb230;p=xonotic%2Fnetradiant.git

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

1a0d1500f7c1582dc7a6283201354588a78fb230