Merge branch 'stable'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 Apr 2015 22:09:06 +0000 (17:09 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 Apr 2015 22:09:06 +0000 (17:09 -0500)
commita35b7c7fb38f7121eacef7fc6a76b06db47fabf2
tree73176f4eb6af01e2f4de158a3371db794d5c619c
parent3ae2371242802ac58ce0ba13c02b911a5a16482e
parent9fa1e602b40d1e531335bf903dc7b15632818cf0
Merge branch 'stable'

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