Index: openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	12 May 2006 21:11:49 -0000	1.40
+++ openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	17 May 2006 07:41:43 -0000	1.41
@@ -66,6 +66,16 @@
 } {
 } -
 
+ad_proc -public -callback contacts::merge {
+    {-from_party_id:required}
+    {-to_party_id:required}
+} {
+    This callback is executed when merging two contacts. Packages should move all information
+    from the from_party_id to the to_party_id. Contacts will attempt to delete the from_party_id
+    at the end of the merge process.
+} -
+
+
 ad_proc -public -callback contacts::extensions {
     {-multirow}
     {-user_id}