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

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

b08b9feba88065d7f79ebf60d3d5fd5a6928f52e