Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_admin/conf/language/lams/ApplicationResources.properties	12 Mar 2007 00:40:40 -0000	1.2.2.1
+++ lams_admin/conf/language/lams/ApplicationResources.properties	20 Apr 2007 06:05:41 -0000	1.2.2.2
@@ -230,5 +230,7 @@
 msg.importv1.created  =Created {0} users and {1} groups.
 msg.importv1.already.exist  =The following logins already exist
 msg.importv1.5 = Note that the passwords of the imported users will be reset, since LAMS 2 does not accept md5 passwords.  They will be reset to the user's login.
+label.can.join.joint.lessons = Can join joint lessons
+label.can.offer.joint.lessons = Can offer joint lessons
 
 #======= End labels: Exported 224 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	12 Mar 2007 00:40:40 -0000	1.2.2.1
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	20 Apr 2007 06:05:41 -0000	1.2.2.2
@@ -230,5 +230,7 @@
 msg.importv1.created  =Created {0} users and {1} groups.
 msg.importv1.already.exist  =The following logins already exist
 msg.importv1.5 = Note that the passwords of the imported users will be reset, since LAMS 2 does not accept md5 passwords.  They will be reset to the user's login.
+label.can.join.joint.lessons = Can join joint lessons
+label.can.offer.joint.lessons = Can offer joint lessons
 
 #======= End labels: Exported 224 labels for en AU =====
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.22.2.1 -r1.22.2.2
--- lams_admin/conf/xdoclet/struts-forms.xml	12 Mar 2007 00:40:41 -0000	1.22.2.1
+++ lams_admin/conf/xdoclet/struts-forms.xml	20 Apr 2007 06:05:41 -0000	1.22.2.2
@@ -11,6 +11,8 @@
 	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
 	<form-property name="courseAdminCanBrowseAllUsers" type="java.lang.Boolean" initial="false"/>
 	<form-property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean" initial="false"/>
+	<form-property name="canJoinJointLessons" type="java.lang.Boolean" initial="false"/>
+	<form-property name="canOfferJointLessons" type="java.lang.Boolean" initial="false"/>
 </form-bean>
 
 <form-bean name="UserRolesForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/web/organisation.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/organisation.jsp,v
diff -u -r1.18 -r1.18.2.1
--- lams_admin/web/organisation.jsp	24 Nov 2006 01:47:30 -0000	1.18
+++ lams_admin/web/organisation.jsp	20 Apr 2007 06:05:41 -0000	1.18.2.1
@@ -86,6 +86,18 @@
 			<fmt:message key="admin.can.change.status"/>
 		</td>
 	</tr>
+	<tr>
+		<td colspan=2>
+			<html-el:checkbox property="canJoinJointLessons" />
+			<fmt:message key="label.can.join.joint.lessons"/>
+		</td>
+	</tr>
+	<tr>
+		<td colspan=2>
+			<html-el:checkbox property="canOfferJointLessons" />
+			<fmt:message key="label.can.offer.joint.lessons"/>
+		</td>
+	</tr>
 	</logic:equal>
 	<logic:notEmpty name="OrganisationForm" property="orgId">
 	<tr>