From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sun, 28 Aug 2011 15:33:45 +0000 (+0200)
Subject: Merge remote branch 'origin/mirceakitsune/sniper_crosshair'
X-Git-Tag: xonotic-v0.5.0~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c8216300d49616ff3124e43af90432868a34a3f2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mirceakitsune/sniper_crosshair'
---

c8216300d49616ff3124e43af90432868a34a3f2