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

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

a741da05a61305170010a4db08bcd254f57c01d8