Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Mon, 22 Sep 2014 22:01:29 +0000 (00:01 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Mon, 22 Sep 2014 22:01:29 +0000 (00:01 +0200)
commit741122565de67c4bc817c8ae3b63187213de26b9
tree92481abe237b9305d6c596fc115cbcd74e301341
parent5c179e1640fb8e843cf517eb2d85ca28239e3a9d
parentfaa04a43de9e515eb7e02bd0064848f7c35d7f0a
Merge remote-tracking branch 'odoo/7.0' into 7.0