From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 24 Jun 2010 12:00:24 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/nex_reticle
X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~17^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=1df5d11d4b4ac8cb8f27a054802c8db1a04e8850

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

1df5d11d4b4ac8cb8f27a054802c8db1a04e8850