From: Jay Pfaffman <jay@pfaffman.com>
Date: Wed, 8 Mar 2017 22:46:46 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/discourse/discourse_docker
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=016e4c78bc0ae726f189fd25ff2b4e4709691308;p=discourse_docker.git

Merge branch 'master' of https://github.com/discourse/discourse_docker
---

016e4c78bc0ae726f189fd25ff2b4e4709691308