From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 14 Feb 2011 17:46:06 +0000 (+0100)
Subject: Merge remote branch 'origin/samual/hitindication'
X-Git-Tag: xonotic-v0.5.0~311^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f0620ef10b0c142cfb2f64d87af78c1243766c6;p=xonotic%2Fxonotic-data.pk3dir.git

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

3f0620ef10b0c142cfb2f64d87af78c1243766c6