MM-ulator: merging deliverables

meeting in S3|06 room 248