From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 17 May 2016 23:00:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'dreamhost/wip-static-website'
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=14d58a3bdabcf811d7074ca1c18a89894646c3fc;p=s3-tests.git

Merge remote-tracking branch 'dreamhost/wip-static-website'

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Conflicts:
	s3tests/functional/test_s3.py
---

14d58a3bdabcf811d7074ca1c18a89894646c3fc