From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 4 Jun 2010 18:58:08 +0000 (+0200)
Subject: Merge remote branch 'icculus/master'
X-Git-Tag: xonotic-v0.5.0~257
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c20b6e1400d759a90b6feebc9c2050274e20bca;p=xonotic%2Fnetradiant.git

Merge remote branch 'icculus/master'
---

0c20b6e1400d759a90b6feebc9c2050274e20bca