From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 3 Apr 2011 23:18:32 +0000 (-0300)
Subject: Merge remote branch 'origin/fruitiex/mapvote_fix'
X-Git-Tag: xonotic-v0.5.0~307^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4a26c1a9c8ae3074931fe8295567935567d58f8b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/mapvote_fix'
---

4a26c1a9c8ae3074931fe8295567935567d58f8b