Blitz image.countFilesetFiles() better exposed
webgateway original_file_paths() displayed in webclient
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 599 (scons: Update to version 2.2.0)
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 636 (Render fs speed 10183 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 659 (Add a script for running all of the necessary xsd-fu commands)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 663 (Fs image links)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 670 (Post-upload import step notifications added.)
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 673 (BfPixelBuffer/BfPixelsWrapper buffer size fixes)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 675 (Re-order jar so nano-xml is always the last one (see #9926) (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 676 (Thumbnails import)
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 599 rleigh-dundee 'scons: Update to version 2.2.0'
  # PR 634 will-moore 'Big images fs 9701 (develop)'
  # PR 636 will-moore 'Render fs speed 10183 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 659 melissalinkert 'Add a script for running all of the necessary xsd-fu commands'
  # PR 663 joshmoore 'Fs image links'
  # PR 670 ximenesuk 'Post-upload import step notifications added.'
  # PR 672 will-moore 'Web fs image links'
  # PR 673 melissalinkert 'BfPixelBuffer/BfPixelsWrapper buffer size fixes'
  # PR 675 jburel 'Re-order jar so nano-xml is always the last one (see #9926) (rebased onto develop)'
  # PR 676 jburel 'Thumbnails import'

Repository: openmicroscopy/bioformats
Updating fe1a095..55b680e
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 355 melissalinkert 'Photoshop TIFF: ignore layers if the channel count is wrong (rebased onto develop)'
  # PR 356 ctrueden 'License updates'

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

Repository: openmicroscopy/ome-documentation
Updating dd7e4e5..fba3536

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