From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 11 Jun 2012 12:18:14 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/func_train_beizer_curve
X-Git-Tag: xonotic-v0.8.0~295^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e368ede69af478891b491c8e0564666910d9012;p=xonotic%2Fxonotic-data.pk3dir.git

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

1e368ede69af478891b491c8e0564666910d9012