===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.270
retrieving revision 1.271
diff -c -r1.270 -r1.271
*** www/events.html	2004/10/27 16:48:51	1.270
--- www/events.html	2004/10/31 12:27:57	1.271
***************
*** 26,46 ****
  
  <ul>
  
- <li><strong><a name=LinuxWorldExpoGermany2004></a>
- <a href="http://www.linuxworldexpo.de/">Linux World Expo</a></strong>,
- Oct 26 - 28, 2004, Frankfurt, Germany.<br>
- There is an OpenBSD and OpenSSH booth, contact
- <a href="mailto:wim@openbsd.org">Wim</a>.
- <p>
- 
- <li><strong><a name=EuroBSDCon2004></a>
- <a href="http://2004.eurobsdcon.org/">EuroBSD Con</a></strong>,
- Oct 29 - 31, 2004, Karlsruhe, Germany.<br>
- There is an OpenBSD and OpenSSH booth, contact
- <a href="mailto:wim@openbsd.org">Wim</a>. Henning is giving a talk
- about <a href="http://2004.eurobsdcon.org/talks.html?&tx_ptspeechupload_pi1[showUid]=44&cHash=ec015b0552">bgpd</a>.
- <p>
- 
  <li><strong><a name=syscan2004></a>
  <a href="http://www.syscan.org/">SyScAN 2004</a></strong>,
  Dec 16 - 17, 2004, Singapore.<br>
--- 26,31 ----
***************
*** 77,82 ****
--- 62,81 ----
  
  <ul>
  
+ <li><strong><a name=EuroBSDCon2004></a>
+ <a href="http://2004.eurobsdcon.org/">EuroBSD Con</a></strong>,
+ Oct 29 - 31, 2004, Karlsruhe, Germany.<br>
+ There was an OpenBSD and OpenSSH booth.
+ Henning gave a talk
+ about <a href="http://2004.eurobsdcon.org/talks.html?&tx_ptspeechupload_pi1[showUid]=44&cHash=ec015b0552">bgpd</a>.
+ <p>
+ 
+ <li><strong><a name=LinuxWorldExpoGermany2004></a>
+ <a href="http://www.linuxworldexpo.de/">Linux World Expo</a></strong>,
+ Oct 26 - 28, 2004, Frankfurt, Germany.<br>
+ There was an OpenBSD and OpenSSH booth.
+ <p>
+ 
  <li><strong><a name=aldil2004></a>
  <a href="http://www.cuug.ab.ca/">Calgary Unix Users's Group</a></strong>,
  Oct 26, 2004, Calgary, Canada.<br>
***************
*** 1196,1202 ****
  <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.270 2004/10/27 16:48:51 deraadt Exp $</small>
  
  </body>
  </html>
--- 1195,1201 ----
  <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.271 2004/10/31 12:27:57 henning Exp $</small>
  
  </body>
  </html>