Merge branch 'master' of csclub.uwaterloo.ca:/srv/git/public/csc-propaganda
authorNick Guenther <nguenthe@bit-shifter.csclub.uwaterloo.ca>
Thu, 7 Nov 2013 21:31:04 +0000 (16:31 -0500)
committerNick Guenther <nguenthe@bit-shifter.csclub.uwaterloo.ca>
Thu, 7 Nov 2013 21:31:04 +0000 (16:31 -0500)

Trivial merge