Adding SphinxRenderer to markup.py
More tweaks to sphinx generation from markup.py
Bring Training/python samples up to date with docs Python.txt
Adding _python_omero_tables_code_samples: ref for docs
Don't show '----' in login server list. See #11273
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 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1326 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1342 (Python code examples and scripts for Paris develop)
merge develop -D org -I include -E exclude: PR 1350 (OMERO.matlab: add functions to update file annotations (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1353 (Fix CLI `omero group perms` subcommmand (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1354 (OMERO.matlab: fix OME-TIFF export for large images (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1355 (Markup to sphinx develop)
merge develop -D org -I include -E exclude: PR 1356 (server_login_list_11273_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 1324 joshmoore 'Jython scripts (See #918)'
  # PR 1326 snoopycrimecop 'Update develop submodules'
  # PR 1342 will-moore 'Python code examples and scripts for Paris develop'
  # PR 1350 sbesson 'OMERO.matlab: add functions to update file annotations (rebased onto develop)'
  # PR 1353 sbesson 'Fix CLI `omero group perms` subcommmand (rebased onto develop)'
  # PR 1354 sbesson 'OMERO.matlab: fix OME-TIFF export for large images (rebased onto develop)'
  # PR 1355 will-moore 'Markup to sphinx develop'
  # PR 1356 will-moore 'server_login_list_11273_develop'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 35 will-moore 'Zooming figures export develop'

Repository: openmicroscopy/ome-documentation
Updating 707d06d..b5d4d9a
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 404 gusferguson 'Updating Download screenshots for Version 5 (FS)'
  # PR 426 hflynn 'Dropbox fix rebased with additional fix'
  # PR 427 hflynn 'Fixes from Petr rebased'

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