merge dev_5_0 -Dorg -Ssuccess-only: PR 966 (Update auto-generated properties)
merge dev_5_0 -Dorg -Ssuccess-only: PR 967 (adding ip6 pg_hba.conf connection line (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only: PR 968 (adding ip6 connection line to pg_hba.conf (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 966 snoopycrimecop 'Update auto-generated properties'
  # PR 967 hflynn 'adding ip6 pg_hba.conf connection line (rebased onto dev_5_0)'
  # PR 968 hflynn 'adding ip6 connection line to pg_hba.conf (rebased onto dev_5_0)'

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