[MERGE] branch merged with lp:openobject-addons
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 26 Sep 2011 05:52:14 +0000 (11:22 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 26 Sep 2011 05:52:14 +0000 (11:22 +0530)
commitb8b2b054fcb27f15e6ddf4fdcb860c8a8b5387e7
treea96503d7b932ade84a6c86eb0d625c3e7af10cba
parentcc859a548362fd882f49f38d0d8a86fc81c34b79
parent371366702bffa4933b817bff3d3b5b262d7429f5
[MERGE] branch merged with lp:openobject-addons

bzr revid: mtr@tinyerp.com-20110926055214-shfrkhp7zs7c1sws