===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.377
retrieving revision 1.378
diff -c -r1.377 -r1.378
*** www/events.html	2005/07/07 10:24:33	1.377
--- www/events.html	2005/07/10 20:52:20	1.378
***************
*** 28,41 ****
  
  <ul>
  
- <li><strong><a name=lsm2005></a>
- <a href="http://2005.rencontresmondiales.org/sections/index_html/switchLanguage/en">Libre Software Meeting 2005</a></strong>,
- July 5 - 9, 2005, Dijon, France.<br>
- There will be an OpenBSD and OpenSSH booth, contact
- <a href="mailto:wim@openbsd.org">Wim</a>. It's nice place to meet some
- of our French and Swiss developers.
- <p>
- 
  <li><strong><a name=wth2005></a>
  <a href="http://www.whatthehack.org"/>What the Hack 2005</a></strong>,
  July 28 - 31, 2005, Den Bosch, The Netherlands.<br>
--- 28,33 ----
***************
*** 86,91 ****
--- 78,92 ----
  
  <ul>
  
+ <li><strong><a name="lsm2005"></a>
+ <a href="http://2005.rencontresmondiales.org/sections/index_html/switchLanguage/en">Libre Software Meeting 2005</a></strong>,
+ July 5 - 9, 2005, Dijon, France.<br>
+ There was an OpenBSD and OpenSSH booth, run by Wim and the usual suspects.
+ It was a nice place to meet some of our French, German and Swiss
+ developers, including Marc Balmer, Alexandre Anriot, Matthieu Herrb and
+ Reyk Floeter.
+ <p>
+ 
  <li><strong><a name=LinuxTag2005></a>
  <a href="http://www.linuxtag.org">LinuxTag 2005</a></strong>,
  June 22 - 25, 2005, Karlsruhe, Germany.<br>
***************
*** 1531,1537 ****
  <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.377 2005/07/07 10:24:33 reyk Exp $</small>
  
  </body>
  </html>
--- 1532,1538 ----
  <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.378 2005/07/10 20:52:20 aanriot Exp $</small>
  
  </body>
  </html>