===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.413
retrieving revision 1.414
diff -c -r1.413 -r1.414
*** www/events.html	2005/10/12 20:52:05	1.413
--- www/events.html	2005/10/15 14:42:48	1.414
***************
*** 28,46 ****
  
  <ul>
  
- <li><strong><a name=linuxworlduk2005></a>
- <a href="http://www.linuxworldexpo.co.uk/">LinuxWorld Expo UK 2005</a></strong>,
- Oct 5 - 6, 2005, Olympia, London, UK.<br>
- There will be an OpenBSD and OpenSSH booth, <a href="mailto:wim@openbsd.org">Wim</a> is looking for booth slaves
- <p>
- 
- <li><strong><a name=linuxkongress2005></a>
- <a href="http://www.linux-kongress.org/">12th International Linux System 
- Technology Conference</a></strong>,
- Oct 11 - 14, 2005, University of Hamburg, Germany.<br>
- There will be an OpenBSD and OpenSSH booth
- <p>
- 
  <li><strong><a name=cafeconf2005></a>
  <a href="http://www.cafeconf.org/">CaFeConf 2005,
  4tas Jornadas Abiertas de GNU/Linux y Software Libre</a></strong>,
--- 28,33 ----
***************
*** 153,158 ****
--- 140,158 ----
  
  <ul>
  
+ <li><strong><a name=linuxkongress2005></a>
+ <a href="http://www.linux-kongress.org/">12th International Linux System 
+ Technology Conference</a></strong>,
+ Oct 11 - 14, 2005, University of Hamburg, Germany.<br>
+ There was an OpenBSD and OpenSSH booth.
+ <p>
+ 
+ <li><strong><a name=linuxworlduk2005></a>
+ <a href="http://www.linuxworldexpo.co.uk/">LinuxWorld Expo UK 2005</a></strong>,
+ Oct 5 - 6, 2005, Olympia, London, UK.<br>
+ There was an OpenBSD and OpenSSH booth.
+ <p>
+ 
  <li><strong><a name=opensourcetag2005></a>
  <a href="http://www.opensourcetag.de/">OpenSourceTag 2005</a></strong>,
  Sep 27, 2005, Hannover, Germany.<br>
***************
*** 1689,1695 ****
  <hr>
  <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
! <br><small>$OpenBSD: events.html,v 1.413 2005/10/12 20:52:05 grunk Exp $</small>
  
  </body>
  </html>
--- 1689,1695 ----
  <hr>
  <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
! <br><small>$OpenBSD: events.html,v 1.414 2005/10/15 14:42:48 bernd Exp $</small>
  
  </body>
  </html>