Merge commit 'origin/translations'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 31 Mar 2010 14:55:06 +0000 (16:55 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 31 Mar 2010 14:55:06 +0000 (16:55 +0200)
commitcd176a16cb54350617ea202de983e8d643978971
treed64592f922d8d589022a0b9e9758e7e699d2091f
parent81c9052f4b6bb42844e04074a8cd4ee4d787260d
parent30d3c4ef622c8068112e37d8900b76cd6394db88
Merge commit 'origin/translations'

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