Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www
authorEdgar Bering <ebering@csclub.uwaterloo.ca>
Tue, 16 Nov 2010 00:32:14 +0000 (19:32 -0500)
committerEdgar Bering <ebering@csclub.uwaterloo.ca>
Tue, 16 Nov 2010 00:32:14 +0000 (19:32 -0500)
commit9654678b0a4faad091215ba186165301c662f8ec
tree685ad5e66d65af5bcb7935e4fe32ef9c7c880d3b
parente546963450bb8d88daa176c030c61ec2b6523859
parentb790c8e744483bbf4c9c2761a66f09cbbe233918
Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www

Conflicts:
events.xml
events.xml