From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 24 Jun 2010 10:30:02 +0000 (+0200)
Subject: Merge branch 'icculus'
X-Git-Tag: xonotic-v0.5.0~255
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64144b4a07584a4d46190f1a75446b7ad40e4dd7;p=xonotic%2Fnetradiant.git

Merge branch 'icculus'
---

64144b4a07584a4d46190f1a75446b7ad40e4dd7