Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www
authorEdgar Bering <ebering@csclub.uwaterloo.ca>
Wed, 29 Sep 2010 19:39:21 +0000 (15:39 -0400)
committerEdgar Bering <ebering@csclub.uwaterloo.ca>
Wed, 29 Sep 2010 19:39:21 +0000 (15:39 -0400)
1  2 
events.xml

diff --cc events.xml
Simple merge