From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 15 Nov 2011 21:28:57 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/power
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=cd68755bc0814a4cd9b05021050edec7dcd718e7

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

cd68755bc0814a4cd9b05021050edec7dcd718e7