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)
commitc430cd50ce7bc9e0a91bccb558e54dafc8d5ef75
tree8802137060984eecdb21fca2107940df59eaddb0
parent08413feb6f7217a4ddb598dfc0ab46e80adb5f99
parenta2c8cf6b53157c864c4203b3e14da2d3d0fe21ba
Merge commit 'origin/translations' into experimental