Remove @override annotation.
merge dev_4_4 -D org -I include -E exclude: PR 982 (Add support for Ice 3.5)
merge dev_4_4 -D org -I include -E exclude: PR 988 (webgallery prototype from github/will-moore/webgallery)
merge dev_4_4 -D org -I include -E exclude: PR 1126 (Fix long-missing DELETE EventLogs)
merge dev_4_4 -D org -I include -E exclude: PR 1234 (Web image object id extension 11022)
merge dev_4_4 -D org -I include -E exclude: PR 1249 (Dataset creation 11048)
merge dev_4_4 -D org -I include -E exclude: PR 1301 (ROIs right_plugin uses .omeroweb_right_plugin())
merge dev_4_4 -D org -I include -E exclude: PR 1302 (Python code examples and scripts for Paris)
merge dev_4_4 -D org -I include -E exclude: PR 1314 (plate_thumbs_11160)
merge dev_4_4 -D org -I include -E exclude: PR 1321 (Insight connectors dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1323 (OMERO.matlab: write text annotation functions)
merge dev_4_4 -D org -I include -E exclude: PR 1329 (Update dev_4_4 submodules)
merge dev_4_4 -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 982 rleigh-dundee 'Add support for Ice 3.5'
  # PR 988 will-moore 'webgallery prototype from github/will-moore/webgallery'
  # PR 1126 joshmoore 'Fix long-missing DELETE EventLogs'
  # PR 1234 manics 'Web image object id extension 11022'
  # PR 1249 will-moore 'Dataset creation 11048'
  # PR 1301 will-moore 'ROIs right_plugin uses .omeroweb_right_plugin()'
  # PR 1302 will-moore 'Python code examples and scripts for Paris'
  # PR 1314 will-moore 'plate_thumbs_11160'
  # PR 1321 jburel 'Insight connectors dev 4 4'
  # PR 1323 sbesson 'OMERO.matlab: write text annotation functions'
  # PR 1329 snoopycrimecop 'Update dev_4_4 submodules'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 549 melissalinkert 'Zeiss LSM: use the longer display channel name'
  # PR 579 melissalinkert 'CellSens: do not set the resolution count'
  # PR 580 melissalinkert 'Zeiss ZVI: ignore invalid plane coordinates (rebased onto dev_4_4)'
  # PR 581 melissalinkert 'SEQ: do not automatically pick up files with the .seq suffix (rebased onto dev_4_4)'
  # PR 584 snoopycrimecop 'Update auto-generated documentation'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 368 rleigh-dundee 'Cpp: Correct content and markup'

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