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 1251 (Improve the logging during image import (see #11020))
merge develop -D org -I include -E exclude: PR 1270 (Show chgrp target tree if Projects OR Datasets exist. See #10917)
merge develop -D org -I include -E exclude: PR 1287 (Matlab examples fix (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1288 (11109 chgrp fails on links)
merge develop -D org -I include -E exclude: PR 1300 (Channel edit)
merge develop -D org -I include -E exclude: PR 1304 (Thumbnail loader)
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 1251 bpindelski 'Improve the logging during image import (see #11020)'
  # PR 1270 will-moore 'Show chgrp target tree if Projects OR Datasets exist. See #10917'
  # PR 1287 sbesson 'Matlab examples fix (rebased onto develop)'
  # PR 1288 joshmoore '11109 chgrp fails on links'
  # PR 1300 jburel 'Channel edit'
  # PR 1304 jburel 'Thumbnail loader'
Conflicting PRs (not included):
  # PR 1269 snoopycrimecop 'Update develop submodules'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 529 melissalinkert 'Still more bug fixes'
  # PR 548 melissalinkert 'SEQ: do not automatically pick up files with the .seq suffix'
  # PR 556 bpindelski 'Add ``mkfake`` tool'
  # PR 559 qidane 'Complete revert of Image->Transform'
  # PR 561 qidane 'Update Bio-Formats 5 docs to 2013-06'
  # PR 562 melissalinkert 'Zeiss CZI improvements'

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 394 qidane 'Update OMERO 5 and Formats docs to 2013-06'

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