Merge pull request #1 from SimpleMachines/release-2.1

Updating local repo to master

.gitattributes

@@ -0,0 +1,10 @@
+# Force our line endings to be LF, even for Windows
+* text
+
+# Set certain files to be binary
+*.png binary
+*.jpg binary
+*.gif binary
+*.tgz binary
+*.zip binary
+*.tar.gz binary

Sources/Subs-Members.php

@@ -541,6 +541,9 @@ function registerMember(&$regOptions, $return_errors = false)
 		$reg_errors[] = array('lang', 'email_in_use', false, array(htmlspecialchars($regOptions['email'])));
 	$smcFunc['db_free_result']($request);
 
+	// Perhaps someone else wants to check this user
+	call_integration_hook('integrate_register_check', array(&$regOptions, &$reg_errors));
+
 	// If we found any errors we need to do something about it right away!
 	foreach ($reg_errors as $key => $error)
 	{