===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- www/events.html 2006/05/15 16:58:58 1.490
+++ www/events.html 2006/05/23 13:07:40 1.491
@@ -42,14 +42,6 @@
--
-SANE 2006,
-May 15 - 19, 2006, Delft, The Netherlands.
-Peter N. M. Hansteen will give a
-
-PF tutorial.
-
-
-
Linuxwochen Vienna 2006,
May 31 - June 2, 2006, Vienna, Austria.
@@ -57,13 +49,6 @@
Boothslaves volunteer at the normal address.
-
-
-Libre Software Meeting 2006,
-Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.
-There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
-suspects, with the help of Serge Basterot and Alexandre Anriot.
-
-
-
FrOSCon 2006 - Free and Open Source Software Conference,
@@ -71,6 +56,13 @@
There will be an OpenBSD and OpenSSH booth run by Wim and the usual suspects.
Boothslaves volunteer at the normal address.
+
+
-
+Libre Software Meeting 2006,
+Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.
+There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
+suspects, with the help of Serge Basterot and Alexandre Anriot.
+
@@ -80,6 +72,14 @@
2006
+-
+SANE 2006,
+May 15 - 19, 2006, Delft, The Netherlands.
+Peter N. M. Hansteen gave a
+
+PF tutorial.
+
+
- BSDCan 2006,
May 12 - 13, 2006, Ottawa, Canada.
@@ -1928,7 +1928,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.490 2006/05/15 16:58:58 reyk Exp $
+
$OpenBSD: events.html,v 1.491 2006/05/23 13:07:40 bernd Exp $