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 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 672 (Web fs image links)
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: PR 706 (Fs file delete)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 709 (Cpu develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 710 (Large image (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 712 (Import bugs develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 718 (Reuse re 10178)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 722 (Fix DropBox on Linux (Fix #9156) (rebased onto 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 634 will-moore 'Big images fs 9701 (develop)'
  # 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 672 will-moore 'Web fs image links'
  # PR 690 manics 'Replace accented character in unknown charset with unicode equivalent (#10251)'
  # PR 693 ximenesuk 'Fs import notifications'
  # PR 706 ximenesuk 'Fs file delete'
  # PR 709 jburel 'Cpu develop'
  # PR 710 jburel 'Large image (rebased onto develop)'
  # PR 712 jburel 'Import bugs develop'
  # PR 718 will-moore 'Reuse re 10178'
  # PR 722 joshmoore 'Fix DropBox on Linux (Fix #9156) (rebased onto develop)'
Conflicting PRs (not included):
  # PR 713 jburel 'Make sure the reference to the connector is removed (see #10333)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 342 melissalinkert 'setId performance improvements'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 370 melissalinkert 'Log every call to setId'
  # PR 372 melissalinkert 'MIAS: add method to parse masks after setId'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.

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