merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 969 (Remove brew deps in favor of brew install --only-dependencies (rebased onto develop))
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 971 (Adding 5.0.4 to OMERO version history (rebased onto develop))
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating c4f65a9..cca0c81
Previously merged:
  # PR 970 sbesson 'Remove unnecessary SLICEPATH on CentOS for developers'
  # PR 962 kennethgillen 'adding ip6 connection line to pg_hba.conf'
  # PR 961 kennethgillen 'adding ip6 pg_hba.conf connection line'

Merged PRs:
  # PR 969 sbesson 'Remove brew deps in favor of brew install --only-dependencies (rebased onto develop)'
  # PR 971 hflynn 'Adding 5.0.4 to OMERO version history (rebased onto develop)'

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