[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Fri, 16 Sep 2011 04:52:27 +0000 (10:22 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Fri, 16 Sep 2011 04:52:27 +0000 (10:22 +0530)
commit3a4e53ab467ac12c00ea40777e9e9e0ae69517ee
treecbd4971148c7f36a4676f50f2b9f0dda7168f5ee
parente8c112c8379823ca2397ab55a310a14c8c275f63
parentd101d3fbaaffe2d0219ac6cfeef50338a2501664
[Merge]with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20110915050724-kh73clbazpsq70dh
bzr revid: dbr@tinyerp.com-20110916045227-l5lte2twthfwbi7c