From: Samual <samual@xonotic.org>
Date: Mon, 10 Jan 2011 03:10:47 +0000 (-0500)
Subject: Merge branch 'master' into samual/keepaway
X-Git-Tag: xonotic-v0.5.0~318^2~123^2~4
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=04f7d85114bae0e592f9b0ef38d97902ed39f560;hp=--cc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into samual/keepaway
---

04f7d85114bae0e592f9b0ef38d97902ed39f560