Merge branch 'master' of /users/www/www/

This commit is contained in:
David Bartley 2007-07-07 06:34:18 -04:00
commit f19987ebeb
1 changed files with 8 additions and 4 deletions

View File

@ -35,10 +35,14 @@ for the benefit of the public--then we must make changes in the other direction.
Ths CSC would like to thank MEF and Mathsoc for funding this talk. Ths CSC would like to thank MEF and Mathsoc for funding this talk.
</p> </p>
<p> <p>
<a href="http://www.fsf.org/events/waterloo20070706">The Freedom Software Foundation's description</a> <a href="http://www.fsf.org/events/waterloo20070706">The
<a href="http://www.defectivebydesign.org">FSF's anti-DRM campaign</a> Freedom Software Foundation's description</a><br />
<a href="http://www.badvista.org">Why you shouldn't use Microsoft Vista</a> <a href="http://www.defectivebydesign.org">FSF's anti-DRM
<a href="http://www.gnu.org">The GNU's Not Unix Project</a> campaign</a><br />
<a href="http://www.badvista.org">Why you shouldn't use
Microsoft Vista</a><br />
<a href="http://www.gnu.org">The GNU's Not Unix
Project</a><br />
</p> </p>
</abstract> </abstract>
</eventitem> </eventitem>