===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -c -r1.69 -r1.70
*** www/hackathons.html	2014/03/27 23:33:15	1.69
--- www/hackathons.html	2014/04/17 15:47:09	1.70
***************
*** 65,70 ****
--- 65,80 ----
  </tr><tr><td bgcolor="#000000" colspan="3"></td>
  </tr><tr valign="top">
  <td>
+     <a id="m2k14" href="images/hackathons/m2k14.gif">
+     <img src="images/hackathons/m2k14-s.gif"></a><br>
+     m2k14: mini hackathon<br>
+     Apr 17 - 22, 2014<br>
+     Marrakech, Morocco<br>
+     12 developers<br>
+     Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
+     and with the support of <a href="http://www.uca.ma/">Universit&eacute; Cadi Ayyad</a>.
+ </td>
+ <td>
      <a id="n2k14" href="images/hackathons/n2k14.gif">
      <img src="images/hackathons/n2k14-s.gif"></a><br>
      n2k14: mini hackathon<br>
***************
*** 72,78 ****
      Dunedin, New Zealand<br>
      15 developers<br>
      Funded by <a href=http://www.foretell.ca>ForeTell Technologies</a>
!     and the support of <a href="http://www.otago.ac.nz">University of Otago</a>.
  </td>
  <td>
      <a id="b2k13" href="images/hackathons/b2k13.gif">
--- 82,88 ----
      Dunedin, New Zealand<br>
      15 developers<br>
      Funded by <a href=http://www.foretell.ca>ForeTell Technologies</a>
!     and with the support of <a href="http://www.otago.ac.nz">University of Otago</a>.
  </td>
  <td>
      <a id="b2k13" href="images/hackathons/b2k13.gif">
***************
*** 82,89 ****
      Berlin, Germany<br>
      21 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and the support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
  </td>
  <td>
      <a id="t2k13" href="images/hackathons/t2k13.jpg">
      <img src="images/hackathons/t2k13-s.gif"></a><br>
--- 92,101 ----
      Berlin, Germany<br>
      21 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and with the support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="t2k13" href="images/hackathons/t2k13.jpg">
      <img src="images/hackathons/t2k13-s.gif"></a><br>
***************
*** 92,101 ****
      Toronto, Canada<br>
      43 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and the support of <a href="http://www.utoronto.ca">University of Toronto</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="n2k13" href="images/hackathons/n2k13.gif">
      <img src="images/hackathons/n2k13-s.gif"></a><br>
--- 104,111 ----
      Toronto, Canada<br>
      43 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and with the support of <a href="http://www.utoronto.ca">University of Toronto</a>.
  </td>
  <td>
      <a id="n2k13" href="images/hackathons/n2k13.gif">
      <img src="images/hackathons/n2k13-s.gif"></a><br>
***************
*** 104,110 ****
      Dunedin, New Zealand<br>
      17 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and the support of <a href="http://www.otago.ac.nz">University of Otago</a>.
  </td>
  <td>
      <a id="c2k12" href="images/hackathons/c2k12.gif">
--- 114,120 ----
      Dunedin, New Zealand<br>
      17 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and with the support of <a href="http://www.otago.ac.nz">University of Otago</a>.
  </td>
  <td>
      <a id="c2k12" href="images/hackathons/c2k12.gif">
***************
*** 114,121 ****
      Coimbra, Portugal<br>
      10 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
  <td>
      <a id="p2k12" href="images/hackathons/p2k12.gif">
      <img src="images/hackathons/p2k12-s.gif"></a><br>
--- 124,133 ----
      Coimbra, Portugal<br>
      10 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="p2k12" href="images/hackathons/p2k12.gif">
      <img src="images/hackathons/p2k12-s.gif"></a><br>
***************
*** 126,133 ****
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      The OpenBSD Project</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="n2k12" href="images/hackathons/n2k12.gif">
      <img src="images/hackathons/n2k12-s.gif"></a><br>
--- 138,143 ----
***************
*** 146,151 ****
--- 156,163 ----
      41 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
  </td>
+ </td></tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="r2k12" href="images/hackathons/r2k12.gif">
      <img src="images/hackathons/r2k12-s.gif"></a><br>
***************
*** 157,164 ****
      and support of <a href="http://www.ihp.fr">Institute Henri Poincaré</a> and
      <a href="http://www.u-psud.fr"</a>Paris-Sud University</a>.
  </td>
- </td></tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="p2k11" href="images/hackathons/p2k11.gif">
      <img src="images/hackathons/p2k11-s.gif"></a><br>
--- 169,174 ----
***************
*** 177,184 ****
      Coimbra, Portugal<br>
      8 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
  <td>
      <a id="s2k11" href="images/hackathons/s2k11.jpg">
      <img src="images/hackathons/s2k11-s.gif"></a><br>
--- 187,196 ----
      Coimbra, Portugal<br>
      8 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="s2k11" href="images/hackathons/s2k11.jpg">
      <img src="images/hackathons/s2k11-s.gif"></a><br>
***************
*** 187,196 ****
      Ljubljana, Slovenia<br>
      25 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and the support of Mitja Mu&#382;eni&#269;.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="c2k11" href="images/hackathons/c2k11.gif">
      <img src="images/hackathons/c2k11-s.gif"></a><br>
--- 199,206 ----
      Ljubljana, Slovenia<br>
      25 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>
!     and with the support of Mitja Mu&#382;eni&#269;.
  </td>
  <td>
      <a id="c2k11" href="images/hackathons/c2k11.gif">
      <img src="images/hackathons/c2k11-s.gif"></a><br>
***************
*** 209,214 ****
--- 219,226 ----
      15 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="p2k10" href="images/hackathons/p2k10.gif">
      <img src="images/hackathons/p2k10-s.gif"></a><br>
***************
*** 219,226 ****
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="j2k10" href="images/hackathons/j2k10.gif">
      <img src="images/hackathons/j2k10-s.gif"></a><br>
--- 231,236 ----
***************
*** 238,243 ****
--- 248,255 ----
      46 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <br>
      <br>
***************
*** 256,263 ****
      and support of
      <a href="http://vpac.org">Victorian Partnership for Advanced Computing</a>
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="h2k9" href="images/hackathons/h2k9.gif">
      <img src="images/hackathons/h2k9-s.gif"></a><br>
--- 268,273 ----
***************
*** 267,273 ****
      15 developers<br>
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>
!     and the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
  <td>
      <a id="p2k9" href="images/hackathons/p2k9.gif">
--- 277,283 ----
      15 developers<br>
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>
!     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
  <td>
      <a id="p2k9" href="images/hackathons/p2k9.gif">
***************
*** 279,284 ****
--- 289,296 ----
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="f2k9" href="images/hackathons/f2k9.gif">
      <img src="images/hackathons/f2k9-s.gif"></a><br>
***************
*** 288,295 ****
      14 developers<br>
      Funded by <a href="https://www.iis.se/english/">.se Foundation</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="c2k9" href="images/hackathons/c2k9.gif">
      <img src="images/hackathons/c2k9-s.gif"></a><br>
--- 300,305 ----
***************
*** 308,313 ****
--- 318,325 ----
      Basel, Switzerland<br>
      19 developers<br>
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="h2k8" href="images/hackathons/h2k8.gif">
      <img src="images/hackathons/h2k8-s.gif"></a><br>
***************
*** 317,326 ****
      18 developers<br>
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>
!     and the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="p2k8" href="images/hackathons/p2k8.gif">
      <img src="images/hackathons/p2k8-s.gif"></a><br>
--- 329,336 ----
      18 developers<br>
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>
!     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
  <td>
      <a id="p2k8" href="images/hackathons/p2k8.gif">
      <img src="images/hackathons/p2k8-s.gif"></a><br>
***************
*** 340,345 ****
--- 350,357 ----
      55 developers<br>
      Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="n2k8" href="images/hackathons/n2k8.gif">
      <img src="images/hackathons/n2k8-s.gif"></a><br>
***************
*** 350,357 ****
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a> and Mark Uemura.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="h2k7" href="images/hackathons/h2k7.gif">
      <img src="images/hackathons/h2k7-s.gif"></a><br>
--- 362,367 ----
***************
*** 361,367 ****
      11 developers<br>
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>
!     and the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
  <td>
      <a id="p2k7" href="images/hackathons/p2k7.gif">
--- 371,377 ----
      11 developers<br>
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>
!     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
  <td>
      <a id="p2k7" href="images/hackathons/p2k7.gif">
***************
*** 373,378 ****
--- 383,390 ----
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="c2k7" href="images/hackathons/c2k7.gif">
      <img src="images/hackathons/c2k7-s.gif"></a><br>
***************
*** 383,390 ****
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="f2k7" href="images/hackathons/f2k7.gif">
      <img src="images/hackathons/f2k7-s.gif"></a><br>
--- 395,400 ----
***************
*** 404,411 ****
      14 developers<br>
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>
!     and the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
  <td>
      <a id="p2k6" href="images/hackathons/p2k6.gif">
      <img src="images/hackathons/p2k6-s.gif"></a><br>
--- 414,423 ----
      14 developers<br>
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>
!     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="p2k6" href="images/hackathons/p2k6.gif">
      <img src="images/hackathons/p2k6-s.gif"></a><br>
***************
*** 416,423 ****
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="k2k6" href="images/hackathons/k2k6.gif">
      <img src="images/hackathons/k2k6-s.gif"></a><br>
--- 428,433 ----
***************
*** 435,440 ****
--- 445,452 ----
      6 developers<br>
      Support of Henning Brauer.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="c2k6" href="images/hackathons/c2k6.gif">
      <img src="images/hackathons/c2k6-s.gif"></a><br>
***************
*** 445,452 ****
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="v2k5" href="images/hackathons/v2k5.gif">
      <img src="images/hackathons/v2k5-s.gif"></a><br>
--- 457,462 ----
***************
*** 467,472 ****
--- 477,484 ----
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="c2k4" href="images/hackathons/c2k4.gif">
      <img src="images/hackathons/c2k4-s.gif"></a><br>
***************
*** 477,484 ****
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="pf2k4" href="images/hackathons/pf2k4.gif">
      <img src="images/hackathons/pf2k4-s.gif"></a><br>
--- 489,494 ----
***************
*** 498,503 ****
--- 508,515 ----
      Funded by <a href="https://www.nlnetlabs.nl">NLnet</a>
      (after DARPA pulled out their support).
  </td>
+ </tr><tr><td bgcolor="#000000" colspan="3"></td>
+ </tr><tr valign="top">
  <td>
      <a id="c2k2" href="images/hackathons/c2k2.gif">
      <img src="images/hackathons/c2k2-s.gif"></a><br>
***************
*** 507,514 ****
      42 developers<br>
      Funded by DARPA.
  </td>
- </tr><tr><td bgcolor="#000000" colspan="3"></td>
- </tr><tr valign="top">
  <td>
      <a id="c2k1-2"/>
      <font color="#e00000">[No shirt was made for this event]</font><br>
--- 519,524 ----
***************
*** 526,531 ****
--- 536,543 ----
      25 developers<br>
      Funded by DARPA with the support of <a href="http://www.mit.edu">MIT</a>.
  </td>
+ <tr><td bgcolor="#000000" colspan="3"></td>
+ <tr valign="top">
  <td>
      <a id="c2k"/>
      <font color="#e00000">[No shirt was made for this event]</font><br>
***************
*** 536,543 ****
      Funded by <a href=http://www.openbsd.org/donations.html>donations to
      the OpenBSD Project</a>.
  </td>
- <tr><td bgcolor="#000000" colspan="3"></td>
- <tr valign="top">
  <td>
      <a id="c99"/>
      <font color="#e00000">[No shirt was made for this event]</font><br>
--- 548,553 ----
***************
*** 557,563 ****
  n2k10 drawn by Theo de Raadt, refined by Ty Semaka.<br>
  c2k10, j2k10, and p2k10 drawn by Damon Mlekuz.<br>
  k2k11 drawn by Bret Lambert.<br>
! r2k12, g2k12, n2k12, b2k13, n2k14 drawn by Markus Hall.<br>
  p2k12 drawn by Bidon Mickael aka Mogmi.<br>
  c2k12 drawn by Theo de Raadt.<br>
  n2k13 is a purchased shirt, with an annotation added.<br>
--- 567,573 ----
  n2k10 drawn by Theo de Raadt, refined by Ty Semaka.<br>
  c2k10, j2k10, and p2k10 drawn by Damon Mlekuz.<br>
  k2k11 drawn by Bret Lambert.<br>
! r2k12, g2k12, n2k12, b2k13, n2k14, m2k14 drawn by Markus Hall.<br>
  p2k12 drawn by Bidon Mickael aka Mogmi.<br>
  c2k12 drawn by Theo de Raadt.<br>
  n2k13 is a purchased shirt, with an annotation added.<br>