===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.371
retrieving revision 1.372
diff -c -r1.371 -r1.372
*** www/events.html 2005/06/07 16:43:37 1.371
--- www/events.html 2005/06/27 17:08:10 1.372
***************
*** 44,56 ****
on activities centered at the University of Alberta.
-
- LinuxTag 2005,
- June 22 - 25, 2005, Karlsruhe, Germany.
- There will be an OpenBSD and OpenSSH booth like every year (booth Y26,
- Friedrich-Weinbrenner-Saal), contact Wim.
-
-
Libre Software Meeting 2005,
July 5 - 9, 2005, Dijon, France.
--- 44,49 ----
***************
*** 106,111 ****
--- 99,111 ----
+ -
+ LinuxTag 2005,
+ June 22 - 25, 2005, Karlsruhe, Germany.
+ There was an OpenBSD and OpenSSH booth ran by Wim, Christian Weisgerber,
+ Marc Balmer, Wilhelm Buehler, Robert Nagy and Bernd Ahlers.
+
+
-
Tokyo PC Users Group,
Tokyo Union Church in Omotesando at 19:00-21:00, June 2, 2005, Tokyo, Japan.
***************
*** 1533,1539 ****
www@openbsd.org
!
$OpenBSD: events.html,v 1.371 2005/06/07 16:43:37 deraadt Exp $