merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 769 (OMERO.tables FloatArrayColumn #10404 (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 770 (Fix Python 2.4 syntax in admin.py (See #10412) (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 771 (Import notification)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 774 (Recursive delete and test cleanup)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 775 (Path display)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 776 (Integrate Cpp build fixes into develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 769 manics 'OMERO.tables FloatArrayColumn #10404 (rebased onto develop)'
  # PR 770 bpindelski 'Fix Python 2.4 syntax in admin.py (See #10412) (rebased onto develop)'
  # PR 771 jburel 'Import notification'
  # PR 774 joshmoore 'Recursive delete and test cleanup'
  # PR 775 jburel 'Path display'
  # PR 776 JesseCorrington 'Integrate Cpp build fixes into develop'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 217 ctrueden 'Prairie fixes'
  # PR 342 melissalinkert 'setId performance improvements'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 378 rleigh-dundee 'Sprint5 bug fixes (develop)'
  # PR 380 ximenesuk 'Removing ndpi from readers list for fs demo'
  # PR 384 melissalinkert 'Imaris HDF: make the optimal tile size be more tile-shaped'
Conflicting PRs (not included):
  # PR 386 melissalinkert 'ICS writer: fix channel count correction (rebased onto develop)'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 256 hflynn 'Developer doc tidy 3 rebased'

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