===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- www/hackathons.html	2017/10/19 17:19:33	1.116
+++ www/hackathons.html	2017/11/01 15:26:34	1.117
@@ -71,6 +71,16 @@
 <tr><td bgcolor="#000000" colspan="3"></td>
 </tr><tr valign="top">
 <td>
+    <a id="p2k17" href="images/hackathons/p2k17.gif">
+    <img src="images/hackathons/p2k17-s.gif"></a><br>
+    p2k17: general hackathon<br>
+    Nov 1 - 6, 2017<br>
+    Berlin, Germany<br>
+    23 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>
+<td>
     <a id="t2k17" href="images/hackathons/t2k17.jpg">
     <img src="images/hackathons/t2k17-s.gif"></a><br>
     t2k17: general hackathon<br>
@@ -89,6 +99,8 @@
     24 developers<br>
     Funded by <a href="http://www.genua.de">GeNUA</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="noshirt" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -98,8 +110,6 @@
     5 developers<br>
     With the support of Bob Beck.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="a2k17" href="images/hackathons/a2k17.gif">
     <img src="images/hackathons/a2k17-s.gif"></a><br>
@@ -132,6 +142,8 @@
     with the help of <a href="http://www.enseeiht.fr">ENSEEIHT</a> and
     <a href="http://www.objectif-libre.com">Objectif Libre</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="b2k16" href="images/hackathons/b2k16.gif">
     <img src="images/hackathons/b2k16-s.gif"></a><br>
@@ -141,8 +153,6 @@
     10 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="g2k16" href="images/hackathons/g2k16.gif">
     <img src="images/hackathons/g2k16-s.gif"></a><br>
@@ -165,6 +175,8 @@
     and <a href="http://www.oracle.com">Oracle</a>, with the help of
     <a href="http://cuni.cz">Charles University</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="p2k16" href="images/hackathons/p2k16.gif">
     <img src="images/hackathons/p2k16-s.gif"></a><br>
@@ -175,8 +187,6 @@
     Funded by <a href="http://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.epitech.eu">Epitech Nantes</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="n2k15" href="images/hackathons/n2k15.gif">
     <img src="images/hackathons/n2k15-s.gif"></a><br>
@@ -197,6 +207,8 @@
     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="l2k15" href="images/hackathons/l2k15.gif">
     <img src="images/hackathons/l2k15-s.gif"></a><br>
@@ -207,8 +219,6 @@
     Funded by <a href="http://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     with help of the <a href="http://foi.unizg.hr">Open Systems and Security Lab</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="j2k15" href="images/hackathons/j2k15.gif">
     <img src="images/hackathons/j2k15-s.gif"></a><br>
@@ -228,6 +238,8 @@
     Funded by <a href="http://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://sait.ca">SAIT</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="p2k15" href="images/hackathons/p2k15.gif">
     <img src="images/hackathons/p2k15-s.gif"></a><br>
@@ -238,8 +250,6 @@
     Funded by <a href="http://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Andy Henderson.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="s2k15" href="images/hackathons/s2k15.gif">
     <img src="images/hackathons/s2k15-s.gif"></a><br>
@@ -260,6 +270,8 @@
     Funded by <a href="http://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     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="m2k14" href="images/hackathons/m2k14.gif">
     <img src="images/hackathons/m2k14-s.gif"></a><br>
@@ -270,8 +282,6 @@
     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>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="n2k14" href="images/hackathons/n2k14.gif">
     <img src="images/hackathons/n2k14-s.gif"></a><br>
@@ -292,6 +302,8 @@
     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>
@@ -302,8 +314,6 @@
     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>
-</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>
@@ -324,6 +334,8 @@
     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>
@@ -334,8 +346,6 @@
     Funded by <a href="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>
@@ -354,6 +364,8 @@
     41 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="r2k12" href="images/hackathons/r2k12.gif">
     <img src="images/hackathons/r2k12-s.gif"></a><br>
@@ -365,8 +377,6 @@
     and support of <a href="http://www.ihp.fr">Institute Henri Poincar&eacute;</a> and
     <a href="http://www.u-psud.fr">Paris-Sud University</a>.
 </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>
@@ -387,6 +397,8 @@
     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>
@@ -397,8 +409,6 @@
     Funded by <a href="http://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     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>
@@ -417,6 +427,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>
@@ -427,8 +439,6 @@
     Funded by <a href="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>
@@ -446,6 +456,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>
@@ -464,8 +476,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>
@@ -487,6 +497,8 @@
     Funded by <a href="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>
@@ -496,8 +508,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>
@@ -516,6 +526,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>
@@ -527,8 +539,6 @@
     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="p2k8" href="images/hackathons/p2k8.gif">
     <img src="images/hackathons/p2k8-s.gif"></a><br>
@@ -548,6 +558,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>
@@ -558,8 +570,6 @@
     Funded by <a href="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>
@@ -581,6 +591,8 @@
     Funded by <a href="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>
@@ -591,8 +603,6 @@
     Funded by <a href="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>
@@ -614,6 +624,8 @@
     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>
@@ -624,8 +636,6 @@
     Funded by <a href="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>
@@ -643,6 +653,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>
@@ -653,8 +665,6 @@
     Funded by <a href="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>
@@ -675,6 +685,8 @@
     Funded by <a href="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>
@@ -685,8 +697,6 @@
     Funded by <a href="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>
@@ -706,6 +716,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>
@@ -715,8 +727,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" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -734,6 +744,8 @@
     25 developers<br>
     Funded by DARPA with the support of <a href="http://www.mit.edu">MIT</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="c2k" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -744,8 +756,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="c99" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -765,7 +775,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, m2k14, g2k14, s2k15, c2k15, l2k15, p2k16, g2k16, b2k16, a2k17, d2k17 drawn by Markus Hall.<br>
+r2k12, g2k12, n2k12, b2k13, n2k14, m2k14, g2k14, s2k15, c2k15, l2k15, p2k16, g2k16, b2k16, a2k17, d2k17, p2k17 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>