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 1133 (Code and mapping changes for new schema)
merge develop -D org -I include -E exclude: PR 1136 (blitz: Use MetadataRoot in MetadataStore implementations)
merge develop -D org -I include -E exclude: PR 1187 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1191 (Import callback)
merge develop -D org -I include -E exclude: PR 1195 (CLI: handle MIF exceptions (#10783))
merge develop -D org -I include -E exclude: PR 1196 (Add 2-Fileset delete tests - both failing)
merge develop -D org -I include -E exclude: PR 1197 (Thumbs table text white on selection)
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 1204 (OMERO.matlab: Add function to retrieve plane information from an image (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1205 (Install genshi before OMERO/Bio-Formats installation using Homebrew)
merge develop -D org -I include -E exclude: PR 1208 (Remove /tmp/memo from OMEROWrapper (Fix #10836))
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 1133 qidane 'Code and mapping changes for new schema'
  # PR 1136 rleigh-dundee 'blitz: Use MetadataRoot in MetadataStore implementations'
  # PR 1187 snoopycrimecop 'Update develop submodules'
  # PR 1191 jburel 'Import callback'
  # PR 1195 sbesson 'CLI: handle MIF exceptions (#10783)'
  # PR 1196 will-moore 'Add 2-Fileset delete tests - both failing'
  # PR 1197 will-moore 'Thumbs table text white on selection'
  # PR 1203 will-moore 'Show Activities panel with new errors'
  # PR 1204 sbesson 'OMERO.matlab: Add function to retrieve plane information from an image (rebased onto develop)'
  # PR 1205 sbesson 'Install genshi before OMERO/Bio-Formats installation using Homebrew'
  # PR 1208 joshmoore 'Remove /tmp/memo from OMEROWrapper (Fix #10836)'
Conflicting PRs (not included):
  # PR 1209 joshmoore 'Merged fs fixes'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 525 melissalinkert 'cpp: replace usage of removed MetadataTools methods'

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 373 mtbc 'add genshi to Linux install docs'

Generated by OMERO-merge-develop#284 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/284/)