From: jal <germangar@gmail.com>
Date: Sun, 11 Jul 2010 10:16:26 +0000 (+0200)
Subject: Merge branch 'master' of ssh://icculus.org/netradiant
X-Git-Tag: xonotic-v0.5.0~245^2~3^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ff62be8fd7526753c301b1a1664fe3de380830e;p=xonotic%2Fnetradiant.git

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

8ff62be8fd7526753c301b1a1664fe3de380830e