From: MaidenBeast <fel.sallustio@gmail.com>
Date: Mon, 27 Jun 2011 11:29:05 +0000 (+0200)
Subject: Merge branch 'master' into MaidenBeast/translation_updates
X-Git-Tag: xonotic-v0.5.0~148^2~25^2~9
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=4d89135c486ca6d2b04118cf861c28f557ab4d30

Merge branch 'master' into MaidenBeast/translation_updates
---

4d89135c486ca6d2b04118cf861c28f557ab4d30