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 1133 (Code and mapping changes for new schema)
merge develop -D org -I include -E exclude: PR 1161 (Notification fs)
merge develop -D org -I include -E exclude: PR 1172 (Add tests that use Fileset as the root.)
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 1183 (fix NPE in indexing file annotations)
merge develop -D org -I include -E exclude: PR 1188 (fix SQL script naming explanation (rebased onto develop))
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

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 1161 jburel 'Notification fs'
  # PR 1172 ximenesuk 'Add tests that use Fileset as the root.'
  # PR 1180 sbesson 'Clean /usr/local Git repository before calling brew doctor (rebased onto develop)'
  # PR 1183 mtbc 'fix NPE in indexing file annotations'
  # PR 1188 mtbc 'fix SQL script naming explanation (rebased onto develop)'
  # PR 1189 ximenesuk 'Avoid creation of Pixels files in chgrp and delete tests'
Conflicting PRs (not included):
  # PR 1187 snoopycrimecop 'Update develop submodules'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # 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'

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