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

Conflicts:

	events.xml
This commit is contained in:
Edgar Bering 2009-02-02 12:48:16 -05:00
commit e2023ca135
1 changed files with 0 additions and 1 deletions

View File

@ -15,7 +15,6 @@
for Unix 103 and 104 that get much more in depth into power programming tools on Unix.</p></abstract>
</eventitem>
<eventitem date="2009-02-06" time="7:00 PM" room="Comfy Lounge" title="Code Party!">
<short>
<p>