[MERGE] Merge lp:openobject-addons.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Wed, 5 Dec 2012 12:04:19 +0000 (17:34 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Wed, 5 Dec 2012 12:04:19 +0000 (17:34 +0530)
commit4a0cc320425678087b3f6b58e987496a8a501d98
treed90b158359e5c612f547ffb3b26a5833ef65d36f
parent149525095c0332e4ce631fcc8b84d5a00c022ca0
parent0e407362e86675627aa67fb2f2d96b482d4294cf
[MERGE] Merge lp:openobject-addons.

bzr revid: bth@tinyerp.com-20121205120419-6yyfl0ik2uars793