From: MaidenBeast <fel.sallustio@gmail.com>
Date: Sun, 31 Jul 2011 19:01:05 +0000 (+0200)
Subject: Merge branch 'master' into MaidenBeast/translation_updates
X-Git-Tag: xonotic-v0.5.0~148^2~25^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ef3002909bfd4b08ff4e2fc2f23e07849bac77e0;p=xonotic%2Fxonotic-data.pk3dir.git

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

ef3002909bfd4b08ff4e2fc2f23e07849bac77e0