From 4bf2c06bf2ace6a6a0b988dc8bfbbefada73fa1c Mon Sep 17 00:00:00 2001
From: Snoopy Crime Cop <snoopycrimecop@gmail.com>
Date: Fri, 9 Feb 2018 01:08:45 +0000
Subject: [PATCH] merge master -Dorg -Snone

Repository: openmicroscopy/omero-server-docker
Already up-to-date.

Merged PRs:
  # PR 2 dpwrussell 'Enable public user'
  # PR 17 joshmoore 'Override omero.db.name (fix #16)'

Generated by DOCKER-merge#285 (https://ci.openmicroscopy.org/job/DOCKER-merge/285/)