Garret Alfert 1603d3d2ff Merge branch 'master' into rs_spec_02 ...

Conflicts:
	lib/remote_storage/riak.rb
	spec/directories_spec.rb

2014-09-23 17:58:21 +02:00

..

riak.rb

Merge branch 'master' into rs_spec_02

2014-09-23 17:58:21 +02:00