Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v diff -u -N -r1.39.2.1 -r1.39.2.2 --- openacs-4/packages/acs-subsite/tcl/group-procs.tcl 5 Sep 2015 09:17:50 -0000 1.39.2.1 +++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl 5 Sep 2015 09:26:59 -0000 1.39.2.2 @@ -424,9 +424,9 @@ } ad_proc -public group::possible_member_states {} { - Returns the list of possible member states: approved, needs approval, banned, rejected, deleted. + Returns the list of possible member states: approved, needs approval, banned, merged, rejected, deleted. } { - return [list approved "needs approval" banned rejected deleted] + return [list approved "needs approval" banned merged rejected deleted] } ad_proc -public group::get_member_state_pretty {