merge develop -Dorg -Ssuccess-only: PR 961 (adding ip6 pg_hba.conf connection line)
merge develop -Dorg -Ssuccess-only: PR 962 (adding ip6 connection line to pg_hba.conf)
merge develop -Dorg -Ssuccess-only: PR 963 (Moving walkthros up a level in TOC)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 161993e..a0ec2c4
Previously merged:
  # PR 958 hflynn 'Delete OMERO tools build info'

Merged PRs:
  # PR 961 kennethgillen 'adding ip6 pg_hba.conf connection line'
  # PR 962 kennethgillen 'adding ip6 connection line to pg_hba.conf'
  # PR 963 hflynn 'Moving walkthros up a level in TOC'

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