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 {
Index: openacs-4/packages/acs-subsite/www/members/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.tcl,v
diff -u -N -r1.20 -r1.20.2.1
--- openacs-4/packages/acs-subsite/www/members/index.tcl	26 Jun 2015 20:47:40 -0000	1.20
+++ openacs-4/packages/acs-subsite/www/members/index.tcl	5 Sep 2015 09:26:59 -0000	1.20.2.1
@@ -10,7 +10,7 @@
     page:naturalnum,optional
 } -validate {
     member_state_valid -requires { member_state } {
-        if { [lsearch [group::possible_member_states] $member_state] == -1 } {
+        if { $member_state ni [group::possible_member_states] } {
             ad_complain "Invalid member_state"
         }
     }