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 1309 (Log error)
merge develop -D org -I include -E exclude: PR 1322 (Matlab examples 3 (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1325 (Improve FS parts of etc/omero.properties)
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 1309 jburel 'Log error'
  # PR 1322 sbesson 'Matlab examples 3 (rebased onto develop)'
  # PR 1324 joshmoore 'Jython scripts (See #918)'
  # PR 1325 mtbc 'Improve FS parts of etc/omero.properties'

Repository: openmicroscopy/bioformats
Updating f3ae0a2..e7a6065
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 572 melissalinkert '2013-06 schema links'
  # PR 573 melissalinkert 'bfopen: save individual series' original metadata'
  # PR 574 rleigh-dundee 'xsd-fu: Generalise language type mapping'
  # PR 578 rleigh-dundee 'xsd-fu: Generalise language type mapping (2)'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 396 joshmoore '11086 logback'
  # PR 404 gusferguson 'Updating Download screenshots for Version 5 (FS)'
  # PR 405 hflynn 'Troubleshooting rebase'

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