From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Fri, 2 Apr 2010 20:06:32 +0000 (+0200)
Subject: Merge branch 'master' into icculus
X-Git-Tag: xonotic-v0.5.0~274
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e9d69cd536783dfdb8227eaf3ba4d7ec0c0d6c9;p=xonotic%2Fnetradiant.git

Merge branch 'master' into icculus
---

5e9d69cd536783dfdb8227eaf3ba4d7ec0c0d6c9