Merge branch 'cleanup_db_after_functest' of github.com:thiagol11/swiftonfile into cleanup_db_after_functest

Conflicts:
	test/functional/__init__.py
This commit is contained in:
Thiago da Silva 2014-07-24 21:14:43 -04:00
commit 408ad0f047

Diff Content Not Available