===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -r1.674 -r1.675
--- www/events.html	2007/06/02 16:55:45	1.674
+++ www/events.html	2007/06/22 14:08:21	1.675
@@ -43,22 +43,6 @@
 <ul>
 <p>
 
-<li><strong><a name="linuxtag2007"></a>
-<a href="http://www.linuxtag.org/2007/en/">LinuxTag 2007</a>
-</strong>,
-May 30 - Jun 2, 2007, Berlin, Germany<br>
-There will be presentations by OpenBSD developers and an OpenBSD booth,
-run by the usual suspects.  NOTE: Peter Hansteen's PF tutorial is now on offer at Linuxtag, get it while it's hot!
-<p>
-
-<li><strong><a name=Slackathon2007></a>
-<a href="http://www.slackathon.se/">Slackathon 2007</a>
-</strong>,
-June 16, 2007, Stockholm, Sweden.<br>
-Yet another round of fund raising for OpenBSD/SSH and general *BSD meeting in
-Stockholm.
-<p>
-
 <li><strong><a name="summercamp2007"></a>
 <a href="http://events.ccc.de/camp/2007">Chaos Communication Camp 2007</a>
 </strong>,
@@ -116,6 +100,22 @@
 <h3>2007</h3>
 <ul>
 
+<li><strong><a name=Slackathon2007></a>
+<a href="http://www.slackathon.se/">Slackathon 2007</a>
+</strong>,
+June 16, 2007, Stockholm, Sweden.<br>
+Yet another round of fund raising for OpenBSD/SSH and general *BSD meeting 
+that took place in Stockholm.
+<p>
+
+<li><strong><a name="linuxtag2007"></a>
+<a href="http://www.linuxtag.org/2007/en/">LinuxTag 2007</a>
+</strong>,
+May 30 - Jun 2, 2007, Berlin, Germany<br>
+There were presentations by OpenBSD developers and an OpenBSD booth,
+run by the usual suspects, and Peter Hansteen held his PF tutorial.
+<p>
+
 <li><strong><a name=LinuxwochenVienna2007></a>
 <a href="http://www.linuxwochen.at/2007/Wien">Linuxwochen Vienna 2007</a>
 </strong>,
@@ -2378,7 +2378,7 @@
 <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.674 2007/06/02 16:55:45 martin Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.675 2007/06/22 14:08:21 mbalmer Exp $</small>
 
 </body>
 </html>