Merge branch 'master' of ssh://caffeine.csclub.uwaterloo.ca/srv/git/www/www
authorMarc Burns <m4burns@uwaterloo.ca>
Sat, 25 Feb 2012 05:15:32 +0000 (00:15 -0500)
committerMarc Burns <m4burns@uwaterloo.ca>
Sat, 25 Feb 2012 05:15:32 +0000 (00:15 -0500)

Trivial merge