swish/commit

New upstream files.

diff --git a/lib/swish/authenticate.pl b/lib/swish/authenticate.pl
index 4c6ef2e..a70c800 100644
--- a/lib/swish/authenticate.pl
+++ b/lib/swish/authenticate.pl
@@ -74,6 +74,7 @@ authenticate(Request, Auth) :-
     debug(authenticate, 'Identity: ~p', [Auth]).
 
 :- multifile
+    swish_config:user_info/3,
     swish_config:authenticate/2,
     swish_config:user_profile/2.
 
diff --git a/lib/swish/plugin/login.pl b/lib/swish/plugin/login.pl
index 2be41d1..0d162b9 100644
--- a/lib/swish/plugin/login.pl
+++ b/lib/swish/plugin/login.pl
@@ -54,6 +54,8 @@
 :- use_module('../config', []).
 
 :- multifile
+    swish_config:login/2,
+    swish_config:login_item/2,
     swish_config:li_login_button//1,    % +Options
     swish_config:reply_logged_in/1,     % +Options
     swish_config:reply_logged_out/1,    % +Options
diff --git a/lib/swish/plugin/profile.pl b/lib/swish/plugin/profile.pl
index 8ed3262..47b4c6a 100644
--- a/lib/swish/plugin/profile.pl
+++ b/lib/swish/plugin/profile.pl
@@ -99,14 +99,17 @@ profile:
 
 :- http_handler(swish(user_profile),   user_profile,   [id(user_profile)]).
 :- http_handler(swish(save_profile),   save_profile,   []).
-:- http_handler(swish(update_profile), update_profile, []).
+:- http_handler(swish(update_profile), update_profile,   []).
 :- http_handler(swish(delete_profile), delete_profile, []).
 
 
 :- multifile
+    swish_config:user_info/3,
     swish_config:reply_logged_in/1,     % +Options
     swish_config:reply_logged_out/1,    % +Options
-    swish_config:user_profile/2.        % +Request, -Info
+    swish_config:user_profile/2,        % +Request, -Info
+    user_profile:attribute/3,
+    user_profile:attribute_mapping/3.
 
 
 		 /*******************************