Merge branch 'masterwmsstaging4views-jco' into master-wmsstaging4-jco
authorJosse Colpaert <jco@odoo.com>
Mon, 7 Jul 2014 12:15:03 +0000 (14:15 +0200)
committerJosse Colpaert <jco@odoo.com>
Mon, 7 Jul 2014 12:15:03 +0000 (14:15 +0200)

Trivial merge