Conflicts:
	cmd/ipfs/add.go
	cmd/ipfs/cat.go
	cmd/ipfs/ls.go
	cmd/ipfs/mount_unix.go