[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Mon, 28 Nov 2011 07:24:23 +0000 (12:54 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Mon, 28 Nov 2011 07:24:23 +0000 (12:54 +0530)
commit5ca999f003f9f747dc7848166c866c0e5a258775
tree85ce27a1dff34c362112c6ac1fa0d0f888d0e949
parent54d2f76703983cf2ed11e260723f606d9a4234fb
parent847bddb3e5b0dda0d7496fccba50c5386eb6072b
[Merge]with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20111128072423-8t2mdtjy422maszs