From 6a49568b8fe618b16274085e7188ab7be60c63bb Mon Sep 17 00:00:00 2001
From: Matt Lee <mattl@gnu.org>
Date: Tue, 23 Feb 2010 16:38:04 +0000
Subject: [PATCH] added link to conference

---
 join.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/join.php b/join.php
index a3a1e544..50ad2a10 100644
--- a/join.php
+++ b/join.php
@@ -1,12 +1,20 @@
-
+<!-- 
 	<h1>LibrePlanet helps users, developers and activists connect and share information and resources.</h1>
 
 	  <div id="signup-form">
 
 	  <p><a href="?p=s">Sign up now</a><!--  or <a href="/tour">take a guided tour!</a>--> &mdash; it takes 30 seconds!</p>
 
-	  </div>
-	 
+	  </div> -->
+
+
+	  <h1>LibrePlanet 2010 conference &mdash; March 19th, 20th and 21st 2010. Harvard Science Center.</h1>
+
+	  <ul>
+	   <li><a href="http://groups.fsf.org/wiki/LibrePlanet2010/Schedule">Conference schedule</a></li>
+    <li><a href="http://groups.fsf.org/wiki/LibrePlanet2010/Attendees">Registration</a> ($60 or free for <a href="http://www.fsf.org/join">FSF members</a>)</li>
+	 </ul>
+
 	 <div id="big-globe">
  
 <p><img src="big-globe.png" /></p>
-- 
2.25.1