From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 28 Nov 2013 03:22:16 +0000 (-0800)
Subject: Merge branch 'master' of github.com:SamSaffron/discourse_docker
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=03f50dca16c357467e473ffc5f1b3b06dd1853e9;p=discourse_docker.git

Merge branch 'master' of github.com:SamSaffron/discourse_docker

Conflicts:
	standalone.template.yml
---

03f50dca16c357467e473ffc5f1b3b06dd1853e9