Nick Craig-Wood 7d8bac2711 google cloud storage: fix merge conflict ...

Conflicts:
	rclone.go
	rclonetest/rclonetest.go

2014-07-16 12:21:01 +01:00

..

rclonetest.go

google cloud storage: fix merge conflict

2014-07-16 12:21:01 +01:00