Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www
authorJennifer Yeelam Wong <jy2wong@caffeine.csclub.uwaterloo.ca>
Wed, 16 Mar 2011 20:10:08 +0000 (16:10 -0400)
committerJennifer Yeelam Wong <jy2wong@caffeine.csclub.uwaterloo.ca>
Wed, 16 Mar 2011 20:10:08 +0000 (16:10 -0400)
commita9eb86ecbe2be1dad94a8adfc172b081a165f458
treef18c14c36df6040e65430916508f53b6b41e9864
parent416167bb75c14cc85a9b41a26629646b032ae343
parentf176137835745620bb6a3bc79175de9c375bbc30
Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www

Conflicts:
events.xml
events.xml