merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 223 (Editing developer intro pages (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 226 (Jenkins stable renaming (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating dd7e4e5..1ee47d5
Merged PRs:
  # PR 223 hflynn 'Editing developer intro pages (rebased onto develop)'
  # PR 226 sbesson 'Jenkins stable renaming (rebased onto develop)'

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