merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 526 (Fix #9480: prevent selection in data browser from selecting invisible im...)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 536 (Insight import location)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 538 (OMERO.tables ArrayColumns #5632)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 558 (Plugin dependencies)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 569 (Add .travis.yml configuration)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 574 (Add gcc from dupes)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 589 (Improvements to windows service user (see #10095))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 591 (Editinplace bugs)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 597 (C++ fixes for building with Ice >= 3.4 (dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 598 (Roi test)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 600 (Channel edit)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 526 mtbc 'Fix #9480: prevent selection in data browser from selecting invisible im...'
  # PR 536 scottlittlewood 'Insight import location'
  # PR 538 manics 'OMERO.tables ArrayColumns #5632'
  # PR 558 jburel 'Plugin dependencies'
  # PR 569 joshmoore 'Add .travis.yml configuration'
  # PR 574 joshmoore 'Add gcc from dupes'
  # PR 589 bpindelski 'Improvements to windows service user (see #10095)'
  # PR 591 will-moore 'Editinplace bugs'
  # PR 597 rleigh-dundee 'C++ fixes for building with Ice >= 3.4 (dev_4_4)'
  # PR 598 jburel 'Roi test'
  # PR 600 jburel 'Channel edit'

Repository: openmicroscopy/bioformats
Updating 03770c0..f290d28
Merged PRs:
  # PR 328 melissalinkert 'Sprint 4 bug fixes, part 2'
  # PR 334 melissalinkert 'Use better schema documentation links'
  # PR 339 melissalinkert 'Docs enhancements'

Repository: ome/scripts
Updating 3587c87..f1abf9e
Merged PRs:
  # PR 18 will-moore 'Split view merged 10109'

Repository: openmicroscopy/ome-documentation
Updating 858e9f2..0250249
Merged PRs:
  # PR 179 sbesson 'CLI documentation'
  # PR 193 manics 'Tables documentation partial rewrite 9957'
  # PR 198 bpindelski 'Update Windows docs (see #10095)'
  # PR 206 dpwrussell 'Fixed forward declartion incomplete type error in c++ example code'

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