Merge commit 'origin/translations' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Mon, 4 Jan 2010 20:22:18 +0000 (21:22 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 4 Jan 2010 20:22:18 +0000 (21:22 +0100)

Trivial merge