From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 6 Mar 2012 16:16:37 +0000 (+0100)
Subject: Merge branch 'divVerent/ru'
X-Git-Tag: xonotic-v0.6.0~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6861746b89abfeced1042896a3eb29ca0f6cd38;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'divVerent/ru'
---

f6861746b89abfeced1042896a3eb29ca0f6cd38