===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -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,6 +65,16 @@
 </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,7 +82,7 @@
     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>.
+    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,8 +92,10 @@
     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>.
+    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,10 +104,8 @@
     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>.
+    and with 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,7 +114,7 @@
     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>.
+    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,8 +124,10 @@
     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>.
+    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,8 +138,6 @@
     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>
@@ -146,6 +156,8 @@
     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,8 +169,6 @@
     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>
@@ -177,8 +187,10 @@
     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>.
+    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,10 +199,8 @@
     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;.
+    and with 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>
@@ -209,6 +219,8 @@
     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,8 +231,6 @@
     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>
@@ -238,6 +248,8 @@
     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,8 +268,6 @@
     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>
@@ -267,7 +277,7 @@
     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>.
+    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,6 +289,8 @@
     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,8 +300,6 @@
     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>
@@ -308,6 +318,8 @@
     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,10 +329,8 @@
     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>.
+    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="p2k8" href="images/hackathons/p2k8.gif">
     <img src="images/hackathons/p2k8-s.gif"></a><br>
@@ -340,6 +350,8 @@
     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,8 +362,6 @@
     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>
@@ -361,7 +371,7 @@
     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>.
+    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,6 +383,8 @@
     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,8 +395,6 @@
     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>
@@ -404,8 +414,10 @@
     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>.
+    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,8 +428,6 @@
     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>
@@ -435,6 +445,8 @@
     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,8 +457,6 @@
     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>
@@ -467,6 +477,8 @@
     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,8 +489,6 @@
     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>
@@ -498,6 +508,8 @@
     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,8 +519,6 @@
     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>
@@ -526,6 +536,8 @@
     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,8 +548,6 @@
     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>
@@ -557,7 +567,7 @@
 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>
+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>