From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 25 Jul 2010 15:13:35 +0000 (+0200)
Subject: Merge remote branch 'icculus/master'
X-Git-Tag: xonotic-v0.5.0~245^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1bae0620f35488b27873231e60106cd69f396824;p=xonotic%2Fnetradiant.git

Merge remote branch 'icculus/master'
---

1bae0620f35488b27873231e60106cd69f396824