svn path=/trunk/; revision=17057

This commit is contained in:
samtuke 2010-09-24 10:09:12 +00:00
父節點 dbec46fa99
當前提交 63c5607db5
共有 1 個檔案被更改,包括 1 行新增16 行删除

查看文件

@ -41,22 +41,7 @@
<h3>Talks</h3>
<ul>
<li>The foundations of the Internet: the dawn of peer-to-peer (working
title) - Benjamin Bayart (<a href="http://www.fdn.fr/">French Data Network</a>)</li>
<li>The Centralisation of the Internet (working title) -
Torsten Grote (<a href="http://blogs.fsfe.org/torsten.grote/">FSFE</a>)</li>
<li>Socially responsible social networks (working title) - Michael
Chisari (<a href="http://opensource.appleseedproject.org/">Appleseed
Project</a>),
Jaussoin Timothée &amp; Ludovic Bocquet (<a
href="http://www.movim.eu">Movim</a>)</li>
<li>Web Search By The People, For The People (working title) - Michael Christen (<a
href="http://www.yacy.net">YaCy</a>)</li>
<li>TBA - Matt Lee (<a href="http://www.fsf.org">FSF</a>)</li>
</ul>
<p>Visit the <a href="http://www.fscons.org/divide">FSCONS Divide and Reconquer page</a> for full details of scheduled talks.</p>
<h2>Fellowship Workshops</h2>