merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 587 (Modulo retrieve (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 592 (C++ fixes for building with Ice >= 3.4)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 599 (scons: Update to version 2.2.0)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 623 (Insight sprint2 (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 625 (Hcs tabular data (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 631 (Handle correctly duplicate thumbnails (see #10225))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 634 (Big images fs 9701 (develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 635 (FS sync: UnregisteredFileException)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 636 (Render fs speed 10183 develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 637 (Remove Bio-Formats common directory from eclipse template)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 638 (_fs_deletelog via triggers)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 642 (Add AssumeNG to repository (see #10238))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 643 (Channel name tweaks (develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 587 jburel 'Modulo retrieve (rebased onto develop)'
  # PR 592 rleigh-dundee 'C++ fixes for building with Ice >= 3.4'
  # PR 599 rleigh-dundee 'scons: Update to version 2.2.0'
  # PR 623 jburel 'Insight sprint2 (rebased onto develop)'
  # PR 625 jburel 'Hcs tabular data (rebased onto develop)'
  # PR 631 jburel 'Handle correctly duplicate thumbnails (see #10225)'
  # PR 634 will-moore 'Big images fs 9701 (develop)'
  # PR 635 joshmoore 'FS sync: UnregisteredFileException'
  # PR 636 will-moore 'Render fs speed 10183 develop'
  # PR 637 joshmoore 'Remove Bio-Formats common directory from eclipse template'
  # PR 638 joshmoore '_fs_deletelog via triggers'
  # PR 642 bpindelski 'Add AssumeNG to repository (see #10238)'
  # PR 643 will-moore 'Channel name tweaks (develop)'

Repository: openmicroscopy/bioformats
Updating fe1a095..e5268a8
Merged PRs:
  # PR 347 melissalinkert 'Photoshop TIFF: fix offset to first layer (rebased onto develop)'
  # PR 349 bpindelski 'Fix Eclipse AssumeNG errors (see #10238)'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 19 will-moore 'Split view merged 10109 (develop)'

Repository: openmicroscopy/ome-documentation
Updating dd7e4e5..1ee47d5
Merged PRs:
  # PR 223 hflynn 'Editing developer intro pages (rebased onto develop)'
  # PR 226 sbesson 'Jenkins stable renaming (rebased onto develop)'

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