Merge branch 'stable'
commit82be36d125fd6c9618b8a70d94a11e1e170bcfbf
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 20 Mar 2015 01:44:49 +0000 (19 20:44 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 20 Mar 2015 01:44:49 +0000 (19 20:44 -0500)
tree7c91309ddd70113d2275f600c56b434f8dfc8b50
parent4522ecef8065c44fab2804ae659812ba5d1e27dd
parent47f66be97cc870e06abb267ef24c138296dc44ea
Merge branch 'stable'

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