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 994 (Restore 3rd-party "overriden" misspelling.)
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)
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 999 (More CPP test fixes)
merge develop -D org -I include -E exclude: PR 1005 (Web bugs march7th develop)
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 994 mtbc 'Restore 3rd-party "overriden" misspelling.'
  # PR 995 mtbc 'Model changes for FS checksums'
  # PR 996 bpindelski 'Display checksum status on import'
  # PR 997 mtbc 'Fix #10602 and clean up IO code. (rebased)'
  # PR 999 joshmoore 'More CPP test fixes'
  # PR 1005 will-moore 'Web bugs march7th develop'
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'
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 319 sbesson 'Add latexpdf to the Travis build (rebased onto develop)'
  # PR 320 sbesson 'Do not expose OMERO_HOME in the doc (see #10603) (rebased onto develop)'
  # PR 323 sbesson 'Explicitly disallow Python 3 and Ice 3.5 in stable docs (rebased onto develop)'
  # PR 324 sbesson 'Doc reorganization (rebased onto develop)'
  # PR 325 joshmoore 'Explicitly disallow Python 3 and Ice 3.5 in stable docs (rebased onto develop)'

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