Merge branch 'pootle-import' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Thu, 2 Dec 2010 17:21:29 +0000 (18:21 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 2 Dec 2010 17:21:29 +0000 (18:21 +0100)
commitf0b00150221004f6dc14652df2a0a27f4bf81127
tree4f3646080ef07cd5bc14496dae5a98d048f8eb18
parentb562d5a27a432cad7e208170f980964cb6099da5
parentbeda5739f01bb4c9dab7235ef4de6e52854fa9ab
Merge branch 'pootle-import' into experimental