Merge commit 'origin/pootle-import' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Mon, 15 Nov 2010 12:20:26 +0000 (13:20 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 15 Nov 2010 12:20:26 +0000 (13:20 +0100)
commit75f57338d1db813a290d55a617498f9b8cb6f578
tree0160c8297542a884c7af40ce5b0e530fa3d7388e
parentd5b9348aa4bde9dc0a57766dcaeece7f3ed3b25b
parent3abbe1e0a11fbb47b84038694d3c53197019c287
Merge commit 'origin/pootle-import' into experimental