===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.395
retrieving revision 1.396
diff -c -r1.395 -r1.396
*** www/events.html	2005/08/23 22:33:38	1.395
--- www/events.html	2005/08/27 19:15:14	1.396
***************
*** 42,47 ****
--- 42,60 ----
  Additional sponsors include USENIX, New York Internet and SRA America.
  <p>
  
+ <li><strong><a name=opensourcetag2005></a>
+ <a href="http://www.opensourcetag.de/">OpenSourceTag 2005</a></strong>,
+ Sept 27, 2005, Hannover, Germany.<br>
+ There will be an OpenBSD and OpenSSH booth and Reyk gives a 
+ <a href=http://www.opensourcetag.de/agenda/>talk</a> about IT security.
+ <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 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=aldil2005></a>
  <a href="http://www.aldil.org/">Les Journ&eacute;es Du Logiciel Libre
  2005</a></strong>,
***************
*** 59,70 ****
--- 72,97 ----
  Many other OpenBSD developers and users are likely to be present.
  <p>
  
+ <li><strong><a name=systems2005></a>
+ <a href="http://www.systems.de/">Systems</a></strong>, 
+ Oct 24 - 28, 2005, Munich, Germany <br>
+ There will be an OpenBSD and OpenSSH booth, run by
+ <a href="mailto:wim@openbsd.org">Wim</a>.
+ <p>
+ 
  <li><strong><a name=opencon2005></a>
  <a href="http://www.opencon.org/">OpenCON 2005</a></strong>,
  November 4 - 6, 2005, San Servolo Island, Venice, Italy.<br>
  The only unique conference entirely dedicated to OpenBSD! 
  <p>
  
+ <li><strong><a name=linuxworldexpogermany2005></a>
+ <a href="http://www.linuxworldexpo.de/">Linux World Expo Germany</a></strong>,
+ Nov 15 - 17, 2005, Frankfurt, Germany.<br>
+ There will be an OpenBSD and OpenSSH booth, run by
+ <a href="mailto:wim@openbsd.org">Wim</a>, booth slaves wanted.
+ <p>
+ 
  <li><strong><a name=eurobsdcon2005></a>
  <a href="http://2005.eurobsdcon.org/">EuroBSDCon 2005</a></strong>,
  November 25 - 27, 2005, Basel, Switzerland.<br>
***************
*** 75,82 ****
  <p>
  
  <li><strong><a name=22c3></a>
! <a href="http://www.ccc.de/congress/2005/">22C3 Chaos Communication Congress in Berlin
! </a></strong>,
  December 27 - 30, 2005, Berlin, Germany.<br>
  Join the many OpenBSD developers and users for a Xmas break in a unique setting
  <p>
--- 102,109 ----
  <p>
  
  <li><strong><a name=22c3></a>
! <a href="http://www.ccc.de/congress/2005/">22C3 Chaos Communication Congress in
! Berlin</a></strong>,
  December 27 - 30, 2005, Berlin, Germany.<br>
  Join the many OpenBSD developers and users for a Xmas break in a unique setting
  <p>
***************
*** 1590,1596 ****
  <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.395 2005/08/23 22:33:38 jsg Exp $</small>
  
  </body>
  </html>
--- 1617,1623 ----
  <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.396 2005/08/27 19:15:14 wvdputte Exp $</small>
  
  </body>
  </html>