[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Wed, 21 Sep 2011 10:44:55 +0000 (16:14 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Wed, 21 Sep 2011 10:44:55 +0000 (16:14 +0530)
commit6d7fe80f9a04eea61b8f3beb9f6ebf91e299d322
tree28eb2c81f6126ddaa062f86fbc4375192ffad0dc
parent3a4e53ab467ac12c00ea40777e9e9e0ae69517ee
parent613fdc7eda327d5f7e45eb9bcca1445499287bf9
[Merge]with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20110921104455-yg1j8lu1yfoufeel