Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 27 insertions, 27 deletions

diff --git a/view/js/mod_register.js b/view/js/mod_register.js
index 839c91911..95bc7bbbb 100644
--- a/view/js/mod_register.js
+++ b/view/js/mod_register.js
@@ -1,29 +1,29 @@
-	$(document).ready(function() {
-		$("#register-email").blur(function() {
-			var zreg_email = $("#register-email").val();
-			$.get("register/email_check.json?f=&email=" + encodeURIComponent(zreg_email),function(data) {
-				$("#register-email-feedback").html(data.message);
-				zFormError("#register-email-feedback",data.error);
-			});
-		});
-		$("#register-password").blur(function() {
-			if(($("#register-password").val()).length < 6 ) {
-				$("#register-password-feedback").html(aStr['pwshort']);
-				zFormError("#register-password-feedback",true);
-			}
-			else {
-				$("#register-password-feedback").html("");
-				zFormError("#register-password-feedback",false);
-			}
-		});
-		$("#register-password2").blur(function() {
-			if($("#register-password").val() != $("#register-password2").val()) {
-				$("#register-password2-feedback").html(aStr['pwnomatch']);
-				zFormError("#register-password2-feedback",true);
-			}
-			else {
-				$("#register-password2-feedback").html("");
-				zFormError("#register-password2-feedback",false);
-			}
+$(document).ready(function() {
+	$("#register-email").blur(function() {
+		var zreg_email = $("#register-email").val();
+		$.get("register/email_check.json?f=&email=" + encodeURIComponent(zreg_email), function(data) {
+			$("#register-email-feedback").html(data.message);
+			zFormError("#register-email-feedback",data.error);
 		});
 	});
+	$("#register-password").blur(function() {
+		if(($("#register-password").val()).length < 6 ) {
+			$("#register-password-feedback").html(aStr.pwshort);
+			zFormError("#register-password-feedback", true);
+		}
+		else {
+			$("#register-password-feedback").html("");
+			zFormError("#register-password-feedback", false);
+		}
+	});
+	$("#register-password2").blur(function() {
+		if($("#register-password").val() != $("#register-password2").val()) {
+			$("#register-password2-feedback").html(aStr.pwnomatch);
+			zFormError("#register-password2-feedback", true);
+		}
+		else {
+			$("#register-password2-feedback").html("");
+			zFormError("#register-password2-feedback", false);
+		}
+	});
+});
\ No newline at end of file