Merge remote-tracking branch 'odoo/master' into master-watchdog-fme
authorFabien Meghazi <fme@openerp.com>
Mon, 4 Aug 2014 15:07:03 +0000 (17:07 +0200)
committerFabien Meghazi <fme@openerp.com>
Mon, 4 Aug 2014 15:07:03 +0000 (17:07 +0200)
commitda26d0c9f1654d2cc0add64f69401995718cdf99
treea74ef1f835e1ffa60508fe3e125628f180ea41b4
parent77723f07b5fc0270d4a582fa3dc60300367946c1
parentdf75edbec7e0f9e8852f81c7478dcb8d4d5ba5db
Merge remote-tracking branch 'odoo/master' into master-watchdog-fme