Merge branch 'pootle-import' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Wed, 7 Sep 2011 14:13:46 +0000 (16:13 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 7 Sep 2011 14:13:46 +0000 (16:13 +0200)
commit849b33656dc710cfa5f644a55680fd396ab1d8d7
tree127ac2ada9e8b6a178c63f4014251dfcf1e0d90b
parent388dcd814d4e99720cb9a6c769611be4951e4ad4
parent7ecb3afa3b41c0eaf3f8962f469173b65dc6580d
Merge branch 'pootle-import' into experimental