Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco
authorJosse Colpaert <jco@odoo.com>
Thu, 19 Jun 2014 13:48:07 +0000 (15:48 +0200)
committerJosse Colpaert <jco@odoo.com>
Thu, 19 Jun 2014 13:48:07 +0000 (15:48 +0200)
commit7f7337e0a8f87b64388c14d08a3546533de7a27b
tree4c7beaebb4ba323f6f88e6af48022668498c9a31
parent026bcc8cfcb3f803646e071246f5976e7b8ee8d3
parentdc4178a9624e49b6bad7dc924206b22fc23d435e
Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco