Merge branch 'master' of https://github.com/odoo/odoo into master-odoo-cmd-fme
authorFabien Meghazi <fme@openerp.com>
Tue, 27 May 2014 07:35:37 +0000 (09:35 +0200)
committerFabien Meghazi <fme@openerp.com>
Tue, 27 May 2014 07:35:37 +0000 (09:35 +0200)
commit81c6e4e2728a2dec59c651190af0dffeee537ed8
tree3c1f0510f2e40e395af1971d8cdd613184d3bc1f
parentdf35de22b80df3a1e57dd38e44dc69de82ef4e50
parent4da882d48ffd09651b66e72a6e5c87e76d05a346
Merge branch 'master' of https://github.com/odoo/odoo into master-odoo-cmd-fme