From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 13 Jan 2011 19:09:45 +0000 (+0100)
Subject: Merge remote branch 'origin/samual/keepaway'
X-Git-Tag: xonotic-v0.5.0~318^2~123
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2263dcdfccd2ffb30adc5373ab8b05bd93b2e90f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/keepaway'
---

2263dcdfccd2ffb30adc5373ab8b05bd93b2e90f