[MERGE] Merged lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Mon, 3 Dec 2012 05:11:42 +0000 (10:41 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Mon, 3 Dec 2012 05:11:42 +0000 (10:41 +0530)
bzr revid: psa@tinyerp.com-20121203051142-3kqunad7eob21ujn


Trivial merge