[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:40:27 +0000 (18:10 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:40:27 +0000 (18:10 +0530)
commitcc2878adf829e8cacdfc67ee8984734335d4bd8a
treecd2f8c89876050110b10cddd043a3af591584e7c
parenta39b265b4202b22278e4d1f510e833236ebeb205
parentfbf6708d1041f84018bb9c13e997b705e6086648
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20110915124027-1dhp83ui5yvku12q