[MERGE] Merged lp:openobject-addons/7.0
authorParamjit Singh Sahota <psa@tinyerp.com>
Fri, 24 May 2013 12:11:16 +0000 (17:41 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Fri, 24 May 2013 12:11:16 +0000 (17:41 +0530)
commit27216b27028f28a3868ca21c436e40b4920db193
tree7462c2209f1583fbcabc825281a454e2145c114f
parent21d80930b00ef237ec2e823cce157b509853cd40
parent423052ac68a626f2f4164c6e01c5f09fd15b8816
[MERGE] Merged lp:openobject-addons/7.0

bzr revid: psa@tinyerp.com-20130524121116-ewinc48bos8khkyp