Merged in [7843] from rcross@amsl.com:

Change Type field default on groups search form, from WG to unset.
 - Legacy-Id: 7926
Note: SVN reference [7843] has been migrated to Git commit 61b1755ae5

bin/mergedevbranch

@@ -129,7 +129,7 @@ fi
 mergelog=$(mktemp)
 svn propget svn:mergeinfo . > $mergelog
 
-if grep "@$rev $branch" mergelog; then die "Changeset $branch@$rev is already in the merge log.  Skipping it."; exit 0; fi
+if grep "@$rev $branch" $mergelog; then die "Changeset $branch@$rev is already in the merge log.  Skipping it."; exit 0; fi
 
 note "Will attempt merge from $branch@$rev"
 

ietf/secr/groups/views.py

@@ -413,7 +413,7 @@ def search(request):
         results = Group.objects.filter(parent__id=area,type='wg',state__in=('bof','active','proposed')).order_by('name')
         form = SearchForm({'primary_area':area,'state':'','type':'wg'})
     else:
-        form = SearchForm(initial={'state':'active','type':'wg'})
+        form = SearchForm(initial={'state':'active'})
 
     # loop through results and tack on meeting_scheduled because it is no longer an
     # attribute of the meeting model