From: Yehuda Sadeh <yehuda@inktank.com>
Date: Fri, 16 Aug 2013 17:55:54 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a06f5784df0c0481430d32eb9142722c8b219bab;p=s3-tests.git

Merge branch 'next'

Conflicts:
	s3tests/functional/test_s3.py

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

a06f5784df0c0481430d32eb9142722c8b219bab