[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 8 Oct 2012 05:04:59 +0000 (10:34 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 8 Oct 2012 05:04:59 +0000 (10:34 +0530)
commit07cf313d8cae521031b19af2a7299dca7172d9f5
tree74bfeba5e1a6db4dbf934e827fee3879268d7cc1
parenta02ccbb36a1cf99264a31a4cae9ab551c89e6413
parent46c83756dad86dfea2391bd33e5c5c4d09fac800
[MERGE] merge with lp:openobject-addons

bzr revid: cha@tinyerp.com-20121005051643-sdqj92jh7vt77ysn
bzr revid: cha@tinyerp.com-20121008050459-2dv1fz23tubmp1qz