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 634 (Big images fs 9701 (develop))
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 645 (xsd-fu cleanup)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 654 (Rebased onto develop of spec clean PR)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 655 (Merge xsd-fu changes from schema-2012-06)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 669 (Introduce FsFile-based representation of checked paths and adjust destination of imported files.)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 672 (Web fs image links)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 687 (License updates)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 690 (Replace accented character in unknown charset with unicode equivalent (#10251))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 693 (Fs import notifications)
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 634 will-moore 'Big images fs 9701 (develop)'
  # PR 642 bpindelski 'Add AssumeNG to repository (see #10238)'
  # PR 645 rleigh-dundee 'xsd-fu cleanup'
  # PR 654 qidane 'Rebased onto develop of spec clean PR'
  # PR 655 rleigh-dundee 'Merge xsd-fu changes from schema-2012-06'
  # PR 669 mtbc 'Introduce FsFile-based representation of checked paths and adjust destination of imported files.'
  # PR 672 will-moore 'Web fs image links'
  # PR 687 ctrueden 'License updates'
  # PR 690 manics 'Replace accented character in unknown charset with unicode equivalent (#10251)'
  # PR 693 ximenesuk 'Fs import notifications'
Conflicting PRs (not included):
  # PR 659 melissalinkert 'Add a script for running all of the necessary xsd-fu commands'

Repository: openmicroscopy/bioformats
Updating 55b680e..948c5e4
Merged PRs:
  # PR 342 melissalinkert 'setId performance improvements'
  # PR 349 bpindelski 'Fix Eclipse AssumeNG errors (see #10238)'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 356 ctrueden 'License updates'
  # PR 364 melissalinkert 'Buffer overrun defensive coding (rebased onto develop)'

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

Repository: openmicroscopy/ome-documentation
Updating fba3536..647af9e

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