Merge branch 'master' of https://github.com/odoo/odoo
authoretenesaca <edgartenesaca@gmail.com>
Tue, 20 May 2014 21:08:22 +0000 (16:08 -0500)
committeretenesaca <edgartenesaca@gmail.com>
Tue, 20 May 2014 21:08:22 +0000 (16:08 -0500)
commit1ce6322bfcc7a9e9d4b1e0102a0bb9bdd242692b
treeddab80b301af8a3e07137f27e0284a60793b3f75
parent49657b28e6915c46342a509e7b4c1e62645e16d4
parenta756b823727b763310fb7d1a24c594f3d78cffe5
Merge branch 'master' of https://github.com/odoo/odoo