[MERGE] Sync with lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Tue, 2 Jul 2013 05:10:12 +0000 (10:40 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Tue, 2 Jul 2013 05:10:12 +0000 (10:40 +0530)
commitd17b018727607a2b17c520f6a395f17e995d0351
tree2cac78295857f6b5c6b1c62d7cbf47caca442c6b
parentc772b614087b365cc7fe4abaf965d9337c9e04cf
parent447895839fd22fa610079a5b30f977b5b89b277d
[MERGE] Sync with lp:openobject-addons.

bzr revid: psa@tinyerp.com-20130702051012-33aad6c3p2vgzm1h