Merge in HEAD, up to 9866.

This commit is contained in:
Colin Kuskie 2009-03-17 23:45:21 +00:00
parent c7a66861a6
commit 2bd7a60a01
107 changed files with 6258 additions and 2436 deletions

View file

@ -328,7 +328,7 @@ sub www_removeFriend {
#-------------------------------------------------------------------
=head2 www_removeFriend ( )
=head2 www_removeFriendConfirm ( )
This is a confirmation page of whether or not the user wishes to remove the selected user from friend