From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 19 Nov 2011 16:38:46 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/consumable_items
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmirceakitsune%2Fconsumable_items;p=voretournament%2Fvoretournament.git

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

691f0d5f85783262222fb8dfc36ad274c7333a66