Sean Handley b8d57724ae Merge branch 'master' of https://github.com/fog/fog ... Conflicts: lib/fog/compute.rb lib/fog/providers.rb		2012-06-22 10:07:19 +01:00
..
drive.rb	Merge branch 'master' of https://github.com/fog/fog	2012-06-22 10:07:19 +01:00
drives.rb	Set up drive objects (not disks).	2012-04-27 14:43:52 +01:00