Merge branch 'master' of /users/git/www/www
authorBryan Coutts <b2coutts@uwaterloo.ca>
Wed, 9 Nov 2016 00:03:48 +0000 (19:03 -0500)
committerBryan Coutts <b2coutts@uwaterloo.ca>
Wed, 9 Nov 2016 00:03:48 +0000 (19:03 -0500)
commit8f9cd45bce5aa9ce68d5db8991820b5e5d3bc080
treec600a0478d60e71f3b46c51338a3d4dbd70423aa
parentde07f04a49d27e5ac8c7c237fc7a4aa17783dbf5
parente62cc5e49c78a6b94e9b4d27783ecb568f40d4cd
Merge branch 'master' of /users/git/www/www

Conflicts:
events.xml
events.xml