From: Sam <sam.saffron@gmail.com>
Date: Thu, 10 Dec 2015 23:53:02 +0000 (+1100)
Subject: Merge branch 'master' of github.com:discourse/discourse_docker
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a104aca3c63efee1a6d5e7375d7f41ecdf7ab38c;p=discourse_docker.git

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

a104aca3c63efee1a6d5e7375d7f41ecdf7ab38c