From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 13 Feb 2011 20:29:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/samual/keepaway'
X-Git-Tag: xonotic-v0.5.0~311^2~21
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=25a047405c94dd9872325e83718e17082c6d459a

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

25a047405c94dd9872325e83718e17082c6d459a