From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 29 Oct 2010 15:21:47 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/fruitiex/crosshairupdates'
X-Git-Tag: xonotic-v0.1.0preview~235
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff27bb747d570e100726964a5fb3b6eaca8f0738;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'refs/remotes/origin/fruitiex/crosshairupdates'
---

ff27bb747d570e100726964a5fb3b6eaca8f0738