Commented code not supported in Java 1.5
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 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1133 (Code and mapping changes for new schema)
merge develop -D org -I include -E exclude: PR 1136 (blitz: Use MetadataRoot in MetadataStore implementations)
merge develop -D org -I include -E exclude: PR 1180 (Clean /usr/local Git repository before calling brew doctor (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1187 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1189 (Avoid creation of Pixels files in chgrp and delete tests)
merge develop -D org -I include -E exclude: PR 1190 (Delete chgrp mif bugs may20th)
merge develop -D org -I include -E exclude: PR 1191 (Import callback)
merge develop -D org -I include -E exclude: PR 1192 (Remove fileset thumbs from right panel)
merge develop -D org -I include -E exclude: PR 1193 (Don't show green tick if delete Error. See #10900)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'
  # PR 1132 knabar 'Repository API'
  # PR 1133 qidane 'Code and mapping changes for new schema'
  # PR 1136 rleigh-dundee 'blitz: Use MetadataRoot in MetadataStore implementations'
  # PR 1180 sbesson 'Clean /usr/local Git repository before calling brew doctor (rebased onto develop)'
  # PR 1187 snoopycrimecop 'Update develop submodules'
  # PR 1189 ximenesuk 'Avoid creation of Pixels files in chgrp and delete tests'
  # PR 1190 will-moore 'Delete chgrp mif bugs may20th'
  # PR 1191 jburel 'Import callback'
  # PR 1192 will-moore 'Remove fileset thumbs from right panel'
  # PR 1193 will-moore 'Don't show green tick if delete Error. See #10900'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 505 rleigh-dundee 'Add MetadataRoot to MetadataStore getRoot/setRoot interfaces'
  # PR 521 melissalinkert 'Assorted bug fixes for May'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 365 mtbc 'fix #10870: describe FS upload configuration'
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'

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