From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 22 Oct 2010 15:40:19 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/kay_crosshairs'
X-Git-Tag: xonotic-v0.1.0preview~259
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6826abb2eb7c6e777bacf41bc0ab95626272ef69;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/kay_crosshairs'
---

6826abb2eb7c6e777bacf41bc0ab95626272ef69