===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.758
retrieving revision 1.759
diff -c -r1.758 -r1.759
*** www/events.html	2008/04/13 10:12:41	1.758
--- www/events.html	2008/04/23 21:46:59	1.759
***************
*** 42,67 ****
  
  <p>
  <ul>
- <li><strong><a name="ukuugspring2008"></a>
- <a href="http://spring2008.ukuug.org/">UKUUG Spring 2008</a></strong>,
- Mar 31 - Apr 2, 2008, Birmingham, UK.<br>
- Peter Hansteen will give a full day <a href="http://spring2008.ukuug.org/talk_abstracts.html#pf_tutorial">PF tutorial</a> and a <a href="http://spring2008.ukuug.org/talk_abstracts.html#6">fighting malware and spam</a> talk.  There will be an OpenBSD booth, manned by Peter.<br>
- <p>
- 
- <li><strong><a name="jtic2008"></a>
- <a href="http://www.iesmirabent.com/jornadas/index2.html">I Jornadas
- Tecnol&oacute;gicas Ciudad de Isla Cristina</a></strong>,
- Apr 3 - 4, 2008, Huelva, Spain.<br>
- Igor Sobrado will give a talk on OpenBSD and related free software
- projects.<br>
- <p>
- 
- <li><strong><a name="DORSCLUC2008"></a>
- <a href="http://www.open.hr/dc2008/en/">DORS / CLUC 2008</a></strong>,
- Apr 16 - Apr 18, 2008, Zagreb, Croatia.<br>
- There will be an OpenBSD booth and a talk on OpenBSD 4.3 by Wim.<br>
- <p>
- 
  <li><strong><a name="bsdcan2008"></a>
  <a href="http://www.bsdcan.org/2008/">BSDCan 2008</a></strong>,
  May 14 - 17, 2008, Ottawa, Canada.<br>
--- 42,47 ----
***************
*** 167,172 ****
--- 147,171 ----
  
  <h3>2008</h3>
  <ul>
+ <li><strong><a name="DORSCLUC2008"></a>
+ <a href="http://www.open.hr/dc2008/en/">DORS / CLUC 2008</a></strong>,
+ Apr 16 - Apr 18, 2008, Zagreb, Croatia.<br>
+ There was an OpenBSD booth, a talk on OpenBSD 4.3 by Wim and an <a href="http://www.kerberos.si/papers/DORS08">IPsec workshop</a> by Wim and Mitja Muzenic.<br>
+ <p>
+ 
+ <li><strong><a name="jtic2008"></a>
+ <a href="http://www.iesmirabent.com/jornadas/index2.html">I Jornadas
+ Tecnol&oacute;gicas Ciudad de Isla Cristina</a></strong>,
+ Apr 3 - 4, 2008, Huelva, Spain.<br>
+ Igor Sobrado gave a talk on OpenBSD and related free software projects.<br>
+ <p>
+ 
+ <li><strong><a name="ukuugspring2008"></a>
+ <a href="http://spring2008.ukuug.org/">UKUUG Spring 2008</a></strong>,
+ Mar 31 - Apr 2, 2008, Birmingham, UK.<br>
+ Peter Hansteen gave a full day <a href="http://spring2008.ukuug.org/talk_abstracts.html#pf_tutorial">PF tutorial</a> and a <a href="http://spring2008.ukuug.org/talk_abstracts.html#6">fighting malware and spam</a> talk.  There was an OpenBSD booth, manned by Peter.<br>
+ <p>
+ 
  <li><strong><a name="asiabsdcon2008"></a>
  <a href="http://2008.asiabsdcon.org/">AsiaBSDCon 2008</a></strong>,
  Mar 27 - 30, 2008, Tokio, Japan.<br>
***************
*** 2678,2684 ****
  <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.758 2008/04/13 10:12:41 tobias Exp $</small>
  
  </body>
  </html>
--- 2677,2683 ----
  <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.759 2008/04/23 21:46:59 johan Exp $</small>
  
  </body>
  </html>