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 1287 (Matlab examples fix (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1308 (lib/repository/Image_5D-1.2.0.jar: Remove)
merge develop -D org -I include -E exclude: PR 1309 (Log error)
merge develop -D org -I include -E exclude: PR 1312 (Matlab examples review (rebased onto develop))
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 1287 sbesson 'Matlab examples fix (rebased onto develop)'
  # PR 1308 rleigh-dundee 'lib/repository/Image_5D-1.2.0.jar: Remove'
  # PR 1309 jburel 'Log error'
  # PR 1312 sbesson 'Matlab examples review (rebased onto develop)'
Conflicting PRs (not included):
  # PR 1311 snoopycrimecop 'Update develop submodules'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 556 bpindelski 'Add ``mkfake`` tool'
  # PR 569 qidane 'Web script for Schema 2013-06 release'
  # PR 571 rleigh-dundee 'specification: Use correct unit and matrix symbols'
  # PR 572 melissalinkert '2013-06 schema links'

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)'

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