[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-red-button
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 14 Jun 2012 06:46:55 +0000 (12:16 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 14 Jun 2012 06:46:55 +0000 (12:16 +0530)
commit85d158600a514036b39d6d586c6f6ee44aaf38b4
tree4fbed4fc50c7389af3ab82c8742b8bb043bca905
parent18f5e4f0265cea3f7f404d3c7a4daf444a385780
parentaa9f9b24e01fd9287eb5bf85ddab0f2e3d04ce37
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-red-button

bzr revid: tpa@tinyerp.com-20120614064655-wksv5wtso0ni6ped