mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Merge branch 'master' of github.com:jamesrose/fog
Conflicts: tests/helper.rb
This commit is contained in:
commit
3a84941e01
Conflicts: tests/helper.rb