[Debconf6-data-commit] r200 - website/www/about/talks

[Andreas Schuldei]

Author: andreas
Date: 2006-01-02 10:23:03 +0000 (Mon, 02 Jan 2006)
New Revision: 200

Modified:
   website/www/about/talks/talks.html
Log:
adding three talks

Modified: website/www/about/talks/talks.html
===================================================================
--- website/www/about/talks/talks.html	2006-01-02 09:38:16 UTC (rev 199)
+++ website/www/about/talks/talks.html	2006-01-02 10:23:03 UTC (rev 200)
@@ -331,5 +331,56 @@
 <td>Social</td>
 </tr>
 
+<tr class="comas_proposal_type_1 comas_proposal_track_3 comas_proposal_status_10">
 
+<td width=*>
+<ul>
+<li><a href="/comas/general/proposals/99">The X Community -- History and Directions</a></li>
+<ul>
+
+<li>Packard, Keith</li>
+
+</ul>
+</ul>
+</td>
+
+<td>Talk (45 min)</td>
+<td>Political</td>
+</tr>
+
+<tr class="comas_proposal_type_1 comas_proposal_track_3 comas_proposal_status_10">
+
+<td width=*>
+<ul>
+<li><a href="/comas/general/proposals/22">Debian and the Law Selected Legal Topics for the Developer</a></li>
+<ul>
+
+<li>Pomerantz, Greg</li>
+
+</ul>
+</ul>
+</td>
+
+<td>Talk (45 min)</td>
+<td>Political</td>
+</tr>
+
+<tr class="comas_proposal_type_1 comas_proposal_track_3 comas_proposal_status_10">
+
+<td width=*>
+<ul>
+<li><a href="/comas/general/proposals/22">Ubuntu annual report</a></li>
+<ul>
+
+<li>Shuttleworth, Mark</li>
+
+</ul>
+</ul>
+</td>
+
+<td>Talk (45 min)</td>
+<td>Social</td>
+</tr>
+
+
 </table>