From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 2 Oct 2010 12:45:48 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/weapon_mine_layer
X-Git-Tag: xonotic-v0.1.0preview~307^2~33^2~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55f3ced5089f63c504b67e59e3a4bf0ab9f99988;p=xonotic%2Fxonotic-data.pk3dir.git

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

55f3ced5089f63c504b67e59e3a4bf0ab9f99988