[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 12 Aug 2010 06:06:00 +0000 (11:36 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 12 Aug 2010 06:06:00 +0000 (11:36 +0530)
commit505fd10dcc58c04005905943a75e1604f6791cf1
treed4af698eace830d28a3693d5732379671399ab03
parent780d30e4ea19c97ee00b88fd4953af8657d88624
parentcf50bdfc74fafcc06f2ea2cd9c160601f8750897
[Merge]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100812060600-5wzswo3oa978w3nh