Merge branch 'proposal'
authorSean Hunt <scshunt@csclub.uwaterloo.ca>
Fri, 19 Sep 2014 23:14:36 +0000 (19:14 -0400)
committerSean Hunt <scshunt@csclub.uwaterloo.ca>
Fri, 19 Sep 2014 23:14:36 +0000 (19:14 -0400)
Constitution changes approved at meeting September 19, 2014.


Trivial merge