Index: openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl	20 Apr 2004 21:13:04 -0000	1.6
+++ openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl	8 Jun 2005 11:11:48 -0000	1.6.2.1
@@ -46,6 +46,7 @@
                         -user_id $rel_user_id                    
                 }
                 "needs approval" { db_exec_plsql unapprove {} }
+                "merged" { db_exec_plsql merge {} }
             }
 
             # Record who changed the state