From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 20 Mar 2015 01:44:49 +0000 (-0500)
Subject: Merge branch 'stable'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=82be36d125fd6c9618b8a70d94a11e1e170bcfbf;p=mediagoblin.git

Merge branch 'stable'

Conflicts:
	docs/source/siteadmin/deploying.rst
---

82be36d125fd6c9618b8a70d94a11e1e170bcfbf
diff --cc docs/source/siteadmin/deploying.rst
index bb77c2ce,350f91ec..af36728c
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@@ -193,7 -193,7 +193,7 @@@ Change to the MediaGoblin directory tha
  
  Clone the MediaGoblin repository and set up the git submodules::
  
-     git clone git://gitorious.org/mediagoblin/mediagoblin.git -b stable
 -    git clone https://gitorious.org/mediagoblin/mediagoblin.git
++    git clone https://gitorious.org/mediagoblin/mediagoblin.git -b stable
      cd mediagoblin
      git submodule init && git submodule update