Update submodules
merge develop -D org -I include -E exclude: PR 912 (Add Bio-Formats' turbojpeg artifact to the classpath)
merge develop -D org -I include -E exclude: PR 989 (Loosen prefix restrictions in FS)
merge develop -D org -I include -E exclude: PR 990 (Remove hard-coded memory settings for 64bit Java 6)
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 995 (Model changes for FS checksums)
merge develop -D org -I include -E exclude: PR 996 (Display checksum status on import (see #10580))
merge develop -D org -I include -E exclude: PR 997 (Fix #10602 and clean up IO code. (rebased))
merge develop -D org -I include -E exclude: PR 1011 (Default to "r" mode if IAdmin.canUpdate fails (Fix #10657))
merge develop -D org -I include -E exclude: PR 1012 (OMERO.matlab: add function to retrieve thumbnails (see #10384) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1013 (Tile size develop)
merge develop -D org -I include -E exclude: PR 1015 (Import as develop)
merge develop -D org -I include -E exclude: PR 1016 (Fix getResolutionDescriptions for pyramid-based files)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 912 melissalinkert 'Add Bio-Formats' turbojpeg artifact to the classpath'
  # PR 989 knabar 'Loosen prefix restrictions in FS'
  # PR 990 joshmoore 'Remove hard-coded memory settings for 64bit Java 6'
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'
  # PR 995 mtbc 'Model changes for FS checksums'
  # PR 996 bpindelski 'Display checksum status on import (see #10580)'
  # PR 997 mtbc 'Fix #10602 and clean up IO code. (rebased)'
  # PR 1011 joshmoore 'Default to "r" mode if IAdmin.canUpdate fails (Fix #10657)'
  # PR 1012 sbesson 'OMERO.matlab: add function to retrieve thumbnails (see #10384) (rebased onto develop)'
  # PR 1013 jburel 'Tile size develop'
  # PR 1015 scottlittlewood 'Import as develop'
  # PR 1016 joshmoore 'Fix getResolutionDescriptions for pyramid-based files'
Conflicting PRs (not included):
  # PR 1000 joshmoore 'Initial clean up of blitz integration tests (Fix #10560)'
  # PR 1006 ximenesuk 'Convert logging to logback predominantly via slf4j'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 159 melissalinkert 'Improve .ndpi support'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 421 melissalinkert 'Documentation for new Imspector format'
  # PR 435 melissalinkert 'Fixes for March 2013 bug week (rebased onto develop)'
  # PR 449 melissalinkert 'Trestle: fix optimal tile sizes for subresolutions'
  # PR 451 melissalinkert 'Fix the component retrieval methods in Index16ColorModel'
  # PR 454 knabar 'Add features to Deltavision interface'
Conflicting PRs (not included):
  # PR 442 mtbc 'bump AssumeNG up from 1.2.3 to 1.2.4'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 23 will-moore 'Kymograph 8206_develop'

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 328 sbesson 'Fix OME Model documentation title and plone menu layout (rebased onto develop)'

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