Merge branch 'master' of github.com:mrda/cloudfiles-tools
Merge branch 'master' of github.com:mrda/cloudfiles-tools