[MERGE] merged lp:~openerp-brazil-team/openerp.pt-br-localiz/migr-l10n-br-base
[MERGE] merged lp:~openerp-brazil-team/openerp.pt-br-localiz/migr-l10n-br-base

odoo-brazil/l10n-brazil-wip,christiandev/l10n-brazil,thinkopensolutions/l10n-brazil,rodrigoasmacedo/l10n-brazil,thinkopensolutions/l10n-brazil,rvalyi/l10n-brazil,rvalyi/l10n-brazil,odoo-brazil/l10n-brazil-wip