[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 30 Aug 2013 09:30:53 +0000 (15:00 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 30 Aug 2013 09:30:53 +0000 (15:00 +0530)
commitadec074def069909ddb1b1f805edf951247f3bfa
tree05c3498800fab037777d0622d88a091ae68705a3
parented4d5b0bc67cbbadc5ec044088e49c67695450ad
parent00d3d9a4b6ee444e68b2db28f0726192a686a411
[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20130830093053-z35j76htaz7td13i