[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Mon, 13 Dec 2010 09:47:58 +0000 (15:17 +0530)
committermtr <mtr@mtr>
Mon, 13 Dec 2010 09:47:58 +0000 (15:17 +0530)
commitf6f6883e5500fc9ae6ba1409611e78354bf40f34
treecadd76ddab552169a77a4d73d934b411d1bc79ec
parentb543c89739931c6be88b51b7069cf0c7cd12fcb1
parent35da4ac8a958288b4e1fd3fc95726e6d4df437b9
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20101213094758-8ukrz1672upzdu2m