Correct spelling for "overridden". (rebase)
match BioFormats bump of AssumeNG up from 1.2.3 to 1.2.4
merge develop -D org -I include -E exclude: PR 898 (Bulk annotations for web image viewer, rebased onto develop)
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 954 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 961 (Basic test of Blitz fileset methods. See #10613)
merge develop -D org -I include -E exclude: PR 968 (Fix bug that causes _treeList to only return last directory entry)
merge develop -D org -I include -E exclude: PR 969 (Split view 10094 develop)
merge develop -D org -I include -E exclude: PR 970 (Web bugs march25th develop)
merge develop -D org -I include -E exclude: PR 973 (loadOmero() improvements (rebased onto develop))
merge develop -D org -I include -E exclude: PR 977 (Correct spelling for "overridden". (rebase))
merge develop -D org -I include -E exclude: PR 978 (match BioFormats bump of AssumeNG up from 1.2.3 to 1.2.4)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 898 knabar 'Bulk annotations for web image viewer, rebased onto develop'
  # PR 912 melissalinkert 'Add Bio-Formats' turbojpeg artifact to the classpath'
  # PR 954 snoopycrimecop 'Update develop submodules'
  # PR 961 will-moore 'Basic test of Blitz fileset methods. See #10613'
  # PR 968 knabar 'Fix bug that causes _treeList to only return last directory entry'
  # PR 969 will-moore 'Split view 10094 develop'
  # PR 970 will-moore 'Web bugs march25th develop'
  # PR 973 sbesson 'loadOmero() improvements (rebased onto develop)'
  # PR 977 mtbc 'Correct spelling for "overridden". (rebase)'
  # PR 978 mtbc 'match BioFormats bump of AssumeNG up from 1.2.3 to 1.2.4'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 159 melissalinkert 'Improve .ndpi support'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 424 qidane 'Specification changes for 2013-06 release'
  # PR 438 melissalinkert 'Fix the autogenerated metadata field counts (rebased onto develop)'
  # PR 439 melissalinkert 'Add support for Aperio AFI data'
  # PR 443 melissalinkert 'Deltavision: ignore null lens IDs in the log file (rebased onto develop)'
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
Updating 663254c..571e4df
Conflicting PRs (not included):
  # PR 312 mtbc 'Minor fixes and increasing consistency in sysadmin docs. (rebase)'

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