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)
commite03708b0a361c236d7034f35e4585edd4a91bb34
tree6e1fa40235be7f5954c97f69fc2357ad33cbe54d
parente7d3f74e6679c23d3f6174e2d8857b5788748af9
parent9d459ff20eb617ec5e0e26cf4dbbdd5f58ebafc9
Merge commit 'origin/translations' into experimental