From: Sam <sam.saffron@gmail.com>
Date: Tue, 10 Mar 2015 04:48:05 +0000 (+1100)
Subject: Merge branch 'master' of github.com:discourse/discourse_docker
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bd2dda19a11b550d0ee7d74ba379bf2e28001813;p=discourse_docker.git

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

bd2dda19a11b550d0ee7d74ba379bf2e28001813