Merge branch 'master' of ssh://inspyration.org/~/OpenERP/cmmi