Merge branch 'pootle-import'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 7 Sep 2011 14:14:22 +0000 (16:14 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 7 Sep 2011 14:14:22 +0000 (16:14 +0200)
commit3811e5e3780b79b1ddc459c971c2ddce5f021470
treeec821f85c04081c838ff9b0ab6be03628623ad7c
parent64d399c3d183fa3f7d02fb73e474e42583538def
parent7ecb3afa3b41c0eaf3f8962f469173b65dc6580d
Merge branch 'pootle-import'