[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 22 Nov 2013 08:54:02 +0000 (14:24 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 22 Nov 2013 08:54:02 +0000 (14:24 +0530)
commitd729f692645ee761700b89577338cda2f58da9fa
tree7aaa6d6ad55475299704641208e943e7dd2ba755
parent04168c970e6b6e0b57dcf43e65d2d8102083df98
parentd2b61742681bd08f56e401a13cae71cd9ff0464e
[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20131122085402-6i6k05cew1z47kxr