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
..
2012-11-02 13:07:59 +01:00
2012-03-17 13:40:39 +01:00
2013-10-11 17:30:05 +02:00