merge develop -Dorg -Ssuccess-only: PR 954 (OMERO developer setup )
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating aba2451..2910dbf
Previously merged:
  # PR 953 mtbc 'tweak server docs (rebased from dev_5_0)'
  # PR 955 hflynn 'Tidying up location of git info'

Merged PRs:
  # PR 954 sbesson 'OMERO developer setup '

Generated by OME-5.1-merge-push#416 (http://ci.openmicroscopy.org/job/OME-5.1-merge-push/416/)