From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 30 Jan 2012 20:40:07 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/portraits
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmirceakitsune%2Fportraits;p=voretournament%2Fvoretournament.git

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

63f49a32549cd3114fd273ed49fc6345cf0dda8d