Merge remote-tracking branch 'odoo/master' into master-web-graph-doc-ged
authorGéry Debongnie <ged@odoo.com>
Tue, 10 Jun 2014 09:17:07 +0000 (11:17 +0200)
committerGéry Debongnie <ged@odoo.com>
Tue, 10 Jun 2014 09:17:07 +0000 (11:17 +0200)
commit96cf03a2751169c95cefe998e37173ec7602f51a
tree94e405cd7ed419e824684045ed42778249382318
parent3d6468a9d0dc49a56ac8e51fa76c7a9296a9142b
parentaa0e83162688e8b791beff3b275eb67ca2baf3ca
Merge remote-tracking branch 'odoo/master' into master-web-graph-doc-ged