merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 193 (Tables documentation partial rewrite 9957)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating 858e9f2..9b636d1
Merged PRs:
  # PR 193 manics 'Tables documentation partial rewrite 9957'

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