[Merge] lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Thu, 7 Mar 2013 06:32:03 +0000 (12:02 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Thu, 7 Mar 2013 06:32:03 +0000 (12:02 +0530)
bzr revid: dbr@tinyerp.com-20130307063203-61q4ozdbsdks0uxj


Trivial merge