[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 15 Nov 2013 07:22:36 +0000 (12:52 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 15 Nov 2013 07:22:36 +0000 (12:52 +0530)
commit559d53463113902ff3f22b87b0f9449766d72035
tree29f6ac1859392d9e5acd88a6e401a720721d20d7
parent05266e0a0f5382c17ec3c0a2aa8d5d8d7cdd4fac
parent3aeed93fc1d17f46ac992ab7d430db2275d6bec0
[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20131115072236-oqmd6bpe2oetvldy