From: acid-burn <acid-burn@opendreambox.org>
Date: Wed, 31 Mar 2010 14:55:06 +0000 (+0200)
Subject: Merge commit 'origin/translations'
X-Git-Tag: 2.8.0~3
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/cd176a16cb54350617ea202de983e8d643978971

Merge commit 'origin/translations'

Conflicts:
	po/de.po
	po/sr.po
---

cd176a16cb54350617ea202de983e8d643978971