From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 28 Jan 2012 20:44:33 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/envmap
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2fc98721177b96c4c06cc961310d6f64a139daf;p=voretournament%2Fvoretournament.git

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

d2fc98721177b96c4c06cc961310d6f64a139daf