Merge commit 'origin/translations' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 29 Dec 2009 21:31:42 +0000 (22:31 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 29 Dec 2009 21:31:42 +0000 (22:31 +0100)
commit5a02c1ec2dd264366daf9988e436196241b6472d
treea0ad5a9fdf78ec867705c6f94d32527413f377fa
parent45f45f957859201a7d11e8339da70d91d0eab8f7
parent890dd6626c3b26f832d8089a3a81289df7005e97
Merge commit 'origin/translations' into experimental