[Merge]with:lp:openobject-addons
authorPinakin Nayi (OpenERP) <pna@tinyerp.com>
Thu, 5 Jul 2012 06:14:58 +0000 (11:44 +0530)
committerPinakin Nayi (OpenERP) <pna@tinyerp.com>
Thu, 5 Jul 2012 06:14:58 +0000 (11:44 +0530)
commitf5cd6b1ccc78add996c85971a99b46368357e219
tree6c9377715a2ded013b44522971c3904c8b5de9c7
parent9c54520f3669262490223f5c1ce68b136ff65e36
parent1af912b22017a512d0a2325f9570ffa35ed7f668
[Merge]with:lp:openobject-addons

bzr revid: pna@tinyerp.com-20120705061458-5qdg7fo748k8wabr