From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 24 Jun 2010 14:18:33 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/nex_reticle
X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4a5cfd617b0f9c3dec82873ce888640a6997bc0f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/nex_reticle
---

4a5cfd617b0f9c3dec82873ce888640a6997bc0f