Update submodules
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 1223 (11000 companion constraints)
merge develop -D org -I include -E exclude: PR 1231 (Move delete mif)
merge develop -D org -I include -E exclude: PR 1251 (Improve the logging during image import (see #11020))
merge develop -D org -I include -E exclude: PR 1252 (Insight locking)
merge develop -D org -I include -E exclude: PR 1256 (11054 on2 delete)
merge develop -D org -I include -E exclude: PR 1257 (Thumbnailbean)
merge develop -D org -I include -E exclude: PR 1260 (11074 export close)
merge develop -D org -I include -E exclude: PR 1262 (OMEROMetadataStoreClient: pixelsList can never be null)
merge develop -D org -I include -E exclude: PR 1267 (DB 4.1-4.4 upgrade script fix from Bernhard Hollaender)
merge develop -D org -I include -E exclude: PR 1269 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1270 (Show chgrp target tree if Projects OR Datasets exist. See #10917)
merge develop -D org -I include -E exclude: PR 1271 (Don't show red dot for non-owned P/D/I S/P/A in tree. #11039)
merge develop -D org -I include -E exclude: PR 1272 (Viewer issue)
merge develop -D org -I include -E exclude: PR 1273 (MIF tests (chgrp/delete))
merge develop -D org -I include -E exclude: PR 1275 (Refresh browser)
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 1223 joshmoore '11000 companion constraints'
  # PR 1231 jburel 'Move delete mif'
  # PR 1251 bpindelski 'Improve the logging during image import (see #11020)'
  # PR 1252 jburel 'Insight locking'
  # PR 1256 joshmoore '11054 on2 delete'
  # PR 1257 jburel 'Thumbnailbean'
  # PR 1260 joshmoore '11074 export close'
  # PR 1262 rleigh-dundee 'OMEROMetadataStoreClient: pixelsList can never be null'
  # PR 1267 joshmoore 'DB 4.1-4.4 upgrade script fix from Bernhard Hollaender'
  # PR 1269 snoopycrimecop 'Update develop submodules'
  # PR 1270 will-moore 'Show chgrp target tree if Projects OR Datasets exist. See #10917'
  # PR 1271 will-moore 'Don't show red dot for non-owned P/D/I S/P/A in tree. #11039'
  # PR 1272 jburel 'Viewer issue'
  # PR 1273 joshmoore 'MIF tests (chgrp/delete)'
  # PR 1275 jburel 'Refresh browser'
Conflicting PRs (not included):
  # PR 1276 mtbc 'fix #11090: disable Cancel All button when not needed'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 529 melissalinkert 'Still more bug fixes'
  # PR 534 melissalinkert 'Revert "MetadataTools: Remove deprecated and unused methods"'
  # PR 536 joshmoore 'Add fake companion file (.fake.properties) (Fix #10993)'
  # PR 537 melissalinkert 'Consolidate OME-XML primitive type logging'
  # PR 541 melissalinkert 'Adjust logging of setId'
  # PR 544 melissalinkert 'Zeiss ZVI: ignore invalid plane coordinates'
  # PR 548 melissalinkert 'SEQ: do not automatically pick up files with the .seq suffix'
  # PR 550 melissalinkert 'AFI: only initialize internal SVS readers once per file'
  # PR 555 qidane 'Adding 2013-06 versions of the samples'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 31 will-moore 'Don't allow jpeg export of Big images'

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

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