From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 11 Jul 2011 07:03:28 +0000 (+0200)
Subject: Merge remote branch 'origin/terencehill/translated_mapvote_title'
X-Git-Tag: xonotic-v0.5.0~148^2~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ead998eb93f3b5df0d46e09455e7aa8fef44540d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/translated_mapvote_title'
---

ead998eb93f3b5df0d46e09455e7aa8fef44540d