Steven Bazyl 8510735db8 Resolve merge conflict, update rspec syntax		2014-12-15 13:32:54 -08:00
..
storages	Resolve merge conflict, update rspec syntax	2014-12-15 13:32:54 -08:00
storage_spec.rb	Resolve merge conflict, update rspec syntax	2014-12-15 13:32:54 -08:00