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

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

85ff31f9ec26adf70f835d95184f6dded9d0c785