[MERGe] Merged lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Mon, 3 Jun 2013 12:33:35 +0000 (18:03 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Mon, 3 Jun 2013 12:33:35 +0000 (18:03 +0530)
bzr revid: psa@tinyerp.com-20130603123335-jgxt7l45gfyii3k9


Trivial merge