[MERGE] Merged lp:openobject-addons
authorParamjit Singh Sahota <psa@tinyerp.com>
Mon, 10 Jun 2013 13:19:53 +0000 (18:49 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Mon, 10 Jun 2013 13:19:53 +0000 (18:49 +0530)
bzr revid: psa@tinyerp.com-20130610131953-psfzlhcuzhv7chcx


Trivial merge