===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.831
retrieving revision 1.832
diff -c -r1.831 -r1.832
*** www/events.html	2010/05/30 11:37:56	1.831
--- www/events.html	2010/05/30 11:39:55	1.832
***************
*** 40,46 ****
  
  <h3>2010</h3>
  <ul>
! -
  </ul>
  
  <p>
--- 40,49 ----
  
  <h3>2010</h3>
  <ul>
! <li><strong><a name="eurobsdcon2010"></a>
! <a href="http://2010.eurobsdcon.org/">EuroBSDCon 2010</a></strong>,
! Oct 8 - 10, 2010, Karlsruhe, Germany.<br>
! <p>
  </ul>
  
  <p>
***************
*** 51,62 ****
  <h3>2010</h3>
  <ul>
  
- <li><strong><a name="securitydate"></a>
- <a href="http://www.securitydate.org/programma.html">SecurityDate 2010</a></strong>,
- May 7, 2010, Camerino, Italy.<br>
- Giovanni Bechis gave a quick update on recent developments in OpenBSD.
- <p>
- 
  <li><strong><a name="bsdcan2010"></a>
  <a href="http://www.bsdcan.org/2010/">BSDCan 2010</a></strong>,
  May 11 - 14, 2010, Ottawa, Canada.<br>
--- 54,59 ----
***************
*** 65,73 ****
  Jean-Philippe Dionne gave a talk about ECDYSIS OPEN-SOURCE NAT64 Implementation in OpenBSD PF.
  <p>
  
! <li><strong><a name="eurobsdcon2010"></a>
! <a href="http://2010.eurobsdcon.org/">EuroBSDCon 2010</a></strong>,
! Oct 8 - 10, 2010, Karlsruhe, Germany.<br>
  <p>
  
  <li><strong><a name="asiabsdcon2010"></a>
--- 62,71 ----
  Jean-Philippe Dionne gave a talk about ECDYSIS OPEN-SOURCE NAT64 Implementation in OpenBSD PF.
  <p>
  
! <li><strong><a name="securitydate"></a>
! <a href="http://www.securitydate.org/programma.html">SecurityDate 2010</a></strong>,
! May 7, 2010, Camerino, Italy.<br>
! Giovanni Bechis gave a quick update on recent developments in OpenBSD.
  <p>
  
  <li><strong><a name="asiabsdcon2010"></a>
***************
*** 2885,2891 ****
  <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.831 2010/05/30 11:37:56 jasper Exp $</small>
  
  </body>
  </html>
--- 2883,2889 ----
  <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.832 2010/05/30 11:39:55 jasper Exp $</small>
  
  </body>
  </html>