[MERGE] branch merged with lp:openobject-addons
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 23 Sep 2011 09:42:54 +0000 (15:12 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 23 Sep 2011 09:42:54 +0000 (15:12 +0530)
commit117fd55da7c9852ad263d3a904e669d9ac52e30b
treeb2dee4a600485854132206d7423916ebfd3f73eb
parent8dae11efc24e55617426b7e8c07e9690520635c3
parent2c2367e551d3fb0412e7de76439a95ea4ac474c8
[MERGE] branch merged with lp:openobject-addons

bzr revid: mtr@tinyerp.com-20110923094254-ghinz9q1k3a6qn20