[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Wed, 10 Oct 2012 06:37:25 +0000 (12:07 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Wed, 10 Oct 2012 06:37:25 +0000 (12:07 +0530)
commit27548d2ae505130961e7ef94cf040f1d138fd70e
treeaca29d2ff3089092d147b24e68a994e48996f810
parent634cb5947040e9be46c80a7a6c5dc7a1b86b5ca3
parent49b102b54a860e655156fced1940ae6b913a7458
[MERGE] merge with lp:openobject-addons

bzr revid: cha@tinyerp.com-20121010063725-8zb6we36o2zf6hgb