Update submodules
merge develop -D org -I include -E exclude: PR 991 (Add support for Ice 3.5 (develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1200 (Fake screen ome)
merge develop -D org -I include -E exclude: PR 1203 (Show Activities panel with new errors)
merge develop -D org -I include -E exclude: PR 1210 (Chgrp target 10908)
merge develop -D org -I include -E exclude: PR 1214 (fix #10782: add IContainer.getImagesBySplitFilesets)
merge develop -D org -I include -E exclude: PR 1219 (Submit failure)
merge develop -D org -I include -E exclude: PR 1221 (Split mif warnings)
merge develop -D org -I include -E exclude: PR 1222 (Add scc travis-merge to the Travis before_install step)
merge develop -D org -I include -E exclude: PR 1223 (11000 companion constraints)
merge develop -D org -I include -E exclude: PR 1225 (Fix Plate delete (Fix #11009, See #10776))
merge develop -D org -I include -E exclude: PR 1226 (add test of proxying showing odd IUpdate issue)
merge develop -D org -I include -E exclude: PR 1227 (OMERO.matlab: add functions to write and link file annotations (see #10385) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1228 (add note in mapping file about checksum documentation)
merge develop -D org -I include -E exclude: PR 1230 (Activities mif removal 11002)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'
  # PR 1132 knabar 'Repository API'
  # PR 1200 qidane 'Fake screen ome'
  # PR 1203 will-moore 'Show Activities panel with new errors'
  # PR 1210 will-moore 'Chgrp target 10908'
  # PR 1214 mtbc 'fix #10782: add IContainer.getImagesBySplitFilesets'
  # PR 1219 jburel 'Submit failure'
  # PR 1221 will-moore 'Split mif warnings'
  # PR 1222 sbesson 'Add scc travis-merge to the Travis before_install step'
  # PR 1223 joshmoore '11000 companion constraints'
  # PR 1225 joshmoore 'Fix Plate delete (Fix #11009, See #10776)'
  # PR 1226 mtbc 'add test of proxying showing odd IUpdate issue'
  # PR 1227 sbesson 'OMERO.matlab: add functions to write and link file annotations (see #10385) (rebased onto develop)'
  # PR 1228 mtbc 'add note in mapping file about checksum documentation'
  # PR 1230 will-moore 'Activities mif removal 11002'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 475 qidane 'Fake screens'
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 529 melissalinkert 'Still more bug fixes'
  # PR 534 melissalinkert 'Revert "MetadataTools: Remove deprecated and unused methods"'
  # PR 537 melissalinkert 'Consolidate OME-XML primitive type logging'
Conflicting PRs (not included):
  # PR 536 joshmoore 'Add fake companion file (.fake.properties) (Fix #10993)'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 378 sbesson 'Add menu for OME5 documentation sets'
  # PR 379 sbesson 'Jenkins docs job (rebased onto develop)'

Generated by SCC-merge#250 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/250/)