Merge branch 'master' of gitorious.org:owncloud/owncloud

apps/files_sharing/js/share.js

@@ -360,7 +360,8 @@ $(document).ready(function() {
 		$(this).select();
 	});
 
-	$('#emailPrivateLink').live('submit', function() {
+	$('#emailPrivateLink').live('submit', function(event) {
+		event.preventDefault();
 		OC.Share.emailPrivateLink();
 	});
 });

settings/js/users.js

@@ -221,6 +221,5 @@ $(document).ready(function(){
 				}
 			}
 		);
-	    location.reload();
 	});
 });