Merge branch 'master' into sharing

lib/filesystem.php

@@ -412,7 +412,7 @@ class OC_FILESYSTEM{
 					}
 				}elseif($storage1=self::getStorage($path1) and $storage2=self::getStorage($path2)){
 					$tmpFile=$storage1->toTmpFile(self::getInternalPath($path1));
-					$result=$storage2->fromTmpFile(self::getInternalPath($path2));
+					$result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2));
 				}
 				OC_HOOK::emit( 'OC_FILESYSTEM', 'post_copy', array( 'oldpath' => $path1 ,'newpath'=>$path2));
 				if(!$exists){