Merge branch 'master' of github.com:rackspace/php-opencloud
Merge branch 'master' of github.com:starberry/php-opencloud into manifest