[Merge]with:lp:openobject-server
authorPinakin Nayi (OpenERP) <pna@tinyerp.com>
Thu, 5 Jul 2012 06:18:52 +0000 (11:48 +0530)
committerPinakin Nayi (OpenERP) <pna@tinyerp.com>
Thu, 5 Jul 2012 06:18:52 +0000 (11:48 +0530)
commit9557adf28bf0beb7d348c57d94f6b7853bfa35b4
tree3501d02f44fa6d85f2a84e9345c6e08d8d69be24
parentfbd5d24aaa6f0dfa3077f1bab002f48002bab11c
parentaed8bf499ea8c1e906c06c9df5fafa9fbfa7ab80
[Merge]with:lp:openobject-server

bzr revid: pna@tinyerp.com-20120705061852-9ad4j06m8586ezxw