Merge commit 'origin/translations' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Wed, 6 Jan 2010 07:27:06 +0000 (08:27 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 6 Jan 2010 07:27:06 +0000 (08:27 +0100)

Trivial merge