merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 224 (Training material)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 227 (Add sections on locking and remote shares to unix/windows)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating 858e9f2..29b61e3
Merged PRs:
  # PR 224 gusferguson 'Training material'
  # PR 227 joshmoore 'Add sections on locking and remote shares to unix/windows'

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