Merge remote-tracking branch 'odoo/master' into master-watchdog-fme
authorFabien Meghazi <fme@openerp.com>
Wed, 6 Aug 2014 13:27:26 +0000 (15:27 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 6 Aug 2014 13:27:26 +0000 (15:27 +0200)
commit07b6def5e31bb1adc6578d4302f0a302f6f24ef4
treecf9342ff1307bb6d9cd9ed61d7ac7d1b349332a5
parentf3ab78685d037d533c804464c0eca493703aa250
parentd71a21bfdb25b6db942d82830788cc165db7c844
Merge remote-tracking branch 'odoo/master' into master-watchdog-fme