[MERGE] Merged lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Mon, 27 May 2013 04:50:48 +0000 (10:20 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Mon, 27 May 2013 04:50:48 +0000 (10:20 +0530)
bzr revid: psa@tinyerp.com-20130527045048-0691dhd1m30x5tvw


Trivial merge