Merge remote-tracking branch 'odoo/master'
authoretenesaca <edgartenesaca@gmail.com>
Thu, 22 May 2014 19:42:14 +0000 (14:42 -0500)
committeretenesaca <edgartenesaca@gmail.com>
Thu, 22 May 2014 19:42:14 +0000 (14:42 -0500)
commitaa1deea9b511230241e0c64627ee2333ffca87a4
tree6253a099696a0ed91b1f2aac521eff25ca1c9c9e
parent0295e12d6c3480995eac8bd8d1e1d1c81bf458b7
parentada00bbe3243076dd56169902c1d4dc6535fc9ec
Merge remote-tracking branch 'odoo/master'