Merge branch 'stable'

Conflicts:
	docs/source/siteadmin/deploying.rst

diff --cc docs/source/siteadmin/deploying.rst
index bb77c2ceb1a7c09ccd880cafe3cf4c69559db1db,350f91ec094f7de7f46e77c61819170432e1380b..af36728cb8d724abd892e7367c0d671da72eec65
--- 1/docs/source/siteadmin/deploying.rst
--- 2/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