=================================================================== RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v retrieving revision 1.33 retrieving revision 1.34 diff -c -r1.33 -r1.34 *** www/hackathons.html 2011/05/25 17:30:18 1.33 --- www/hackathons.html 2011/07/10 18:52:11 1.34 *************** *** 343,348 **** --- 343,358 ---- Apr 1 - 7, 2011
Hafnarfjordur, Iceland
15 developers
+ + + + +
+ c2k11: General hackathon
+ Jul 2 - 9, 2011
+ Edmonton, Alberta, Canada
+ 36 developers
+
*************** *** 357,363 ****
OpenBSD www@openbsd.org !
$OpenBSD: hackathons.html,v 1.33 2011/05/25 17:30:18 lum Exp $ --- 367,373 ----
OpenBSD www@openbsd.org !
$OpenBSD: hackathons.html,v 1.34 2011/07/10 18:52:11 deraadt Exp $